diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2017-12-21 14:07:07 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-01-26 16:02:37 -0500 |
| commit | 233aefdba8d4692e100d0c30a3145ec7a65ca376 (patch) | |
| tree | b516e8bd7b0751afffa8dd4c7235ca7fa1457c0b /data | |
| parent | 072feae4f1825f1416ea1babc8f5db3802b0f710 (diff) | |
gst-android: Move comment before the rule
The @# break when running on Windows
https://bugzilla.gnome.org/show_bug.cgi?id=791854
Diffstat (limited to 'data')
| -rw-r--r-- | data/ndk-build/gstreamer-1.0.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 91ae9279..3796115c 100644 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -193,6 +193,7 @@ delsharedlib_$(TARGET_ARCH_ABI): $(LOCAL_INSTALLED): delsharedlib_$(TARGET_ARCH_ABI) # Generates a source file that declares and registers all the required plugins +# about the sed command, android-studio doesn't seem to like line continuation characters when executing shell commands genstatic_$(TARGET_ARCH_ABI): PRIV_C := $(GSTREAMER_ANDROID_C) genstatic_$(TARGET_ARCH_ABI): PRIV_B_DIR := $(GSTREAMER_BUILD_DIR) genstatic_$(TARGET_ARCH_ABI): PRIV_C_IN := $(GSTREAMER_ANDROID_C_IN) @@ -203,7 +204,6 @@ genstatic_$(TARGET_ARCH_ABI): PRIV_G_R := $(G_IO_MODULES_DECLARE) genstatic_$(TARGET_ARCH_ABI): @$(HOST_ECHO) "GStreamer : [GEN] => $(PRIV_C)" @$(call host-mkdir,$(PRIV_B_DIR)) - @# android-studio doesn't seem to like line continuation characters when executing shell commands @$(SED_LOCAL) "s/@PLUGINS_DECLARATION@/$(PRIV_P_D)/g" $(PRIV_C_IN) | $(SED_LOCAL) "s/@PLUGINS_REGISTRATION@/$(PRIV_P_R)/g" | $(SED_LOCAL) "s/@G_IO_MODULES_LOAD@/$(PRIV_G_L)/g" | $(SED_LOCAL) "s/@G_IO_MODULES_DECLARE@/$(PRIV_G_R)/g" > $(PRIV_C) # Compile the source file @@ -240,14 +240,13 @@ else GSTREAMER_COPY_FILE_SUBST := // endif +# about the sed command, android-studio doesn't seem to like line continuation characters when executing shell commands copyjavasource_$(TARGET_ARCH_ABI): @$(call host-mkdir,$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer) @$(foreach plugin,$(GSTREAMER_PLUGINS_WITH_CLASSES), \ $(call host-mkdir,$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/$(plugin)) && ) echo Done mkdir @$(foreach file,$(GSTREAMER_PLUGINS_CLASSES), \ $(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)$(file),$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/$(file)) && ) echo Done cp - - @# android-studio doesn't seem to like line continuation characters when executing shell commands @$(SED_LOCAL) "s;@INCLUDE_FONTS@;$(GSTREAMER_INCLUDE_FONTS_SUBST);g" $(GSTREAMER_NDK_BUILD_PATH)/GStreamer.java | $(SED_LOCAL) "s;@INCLUDE_CA_CERTIFICATES@;$(GSTREAMER_INCLUDE_CA_CERTIFICATES_SUBST);g" | $(SED_LOCAL) "s;@INCLUDE_COPY_FILE@;$(GSTREAMER_COPY_FILE_SUBST);g" > $(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/GStreamer.java ifndef GSTREAMER_ASSETS_DIR |