diff options
| author | Andy Devar <andy.devar@gmail.com> | 2016-08-12 16:16:24 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-08-12 16:17:29 +0200 |
| commit | 3b545253e6f16990954ff2f002777e6a068fff16 (patch) | |
| tree | 4b6a7ddbb1f83789c4079722d03440262b2f4370 /data | |
| parent | 253fdcf0b0f06d2bd8653d09686318b83f96f2ba (diff) | |
android: Fix Android build on Windows
Windows a) requires quotes around commands if you | them and b) remembers
empty quotes in Makefiles and confuses the shell with them.
https://bugzilla.gnome.org/show_bug.cgi?id=768326
Diffstat (limited to 'data')
| -rwxr-xr-x | data/ndk-build/gstreamer-1.0.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index e1f1d665..b6cf24ae 100755 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -65,8 +65,10 @@ G_IO_MODULES_PATH := $(GSTREAMER_ROOT)/lib/gio/modules/static # Host tools ifeq ($(HOST_OS),windows) SED := $(GSTREAMER_NDK_BUILD_PATH)/tools/windows/sed + SED_LOCAL := "$(GSTREAMER_NDK_BUILD_PATH)/tools/windows/sed" else SED := sed + SED_LOCAL := sed endif ifndef GSTREAMER_ANDROID_MODULE_NAME @@ -207,10 +209,10 @@ 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)) - @$(SED) "s/@PLUGINS_DECLARATION@/$(PRIV_P_D)/g" $(PRIV_C_IN) | \ - $(SED) "s/@PLUGINS_REGISTRATION@/$(PRIV_P_R)/g" | \ - $(SED) "s/@G_IO_MODULES_LOAD@/$(PRIV_G_L)/g" | \ - $(SED) "s/@G_IO_MODULES_DECLARE@/$(PRIV_G_R)/g" > $(PRIV_C) + @$(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 $(GSTREAMER_ANDROID_O): PRIV_C := $(GSTREAMER_ANDROID_C) @@ -229,21 +231,21 @@ buildsharedlibrary_$(TARGET_ARCH_ABI): $(GSTREAMER_ANDROID_O) @$(PRIV_CMD) ifeq ($(GSTREAMER_INCLUDE_FONTS),yes) -GSTREAMER_INCLUDE_FONTS_SUBST="" +GSTREAMER_INCLUDE_FONTS_SUBST := else -GSTREAMER_INCLUDE_FONTS_SUBST="//" +GSTREAMER_INCLUDE_FONTS_SUBST := // endif ifeq ($(GSTREAMER_INCLUDE_CA_CERTIFICATES),yes) -GSTREAMER_INCLUDE_CA_CERTIFICATES_SUBST="" +GSTREAMER_INCLUDE_CA_CERTIFICATES_SUBST := else -GSTREAMER_INCLUDE_CA_CERTIFICATES_SUBST="//" +GSTREAMER_INCLUDE_CA_CERTIFICATES_SUBST := // endif ifneq (,$(findstring yes,$(GSTREAMER_INCLUDE_FONTS)$(GSTREAMER_INCLUDE_CA_CERTIFICATES))) -GSTREAMER_COPY_FILE_SUBST="" +GSTREAMER_COPY_FILE_SUBST := else -GSTREAMER_COPY_FILE_SUBST="//" +GSTREAMER_COPY_FILE_SUBST := // endif copyjavasource_$(TARGET_ARCH_ABI): @@ -253,9 +255,9 @@ copyjavasource_$(TARGET_ARCH_ABI): @$(foreach file,$(GSTREAMER_PLUGINS_CLASSES), \ $(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)$(file),$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/$(file)) && ) echo Done cp - @$(SED) "s;@INCLUDE_FONTS@;$(GSTREAMER_INCLUDE_FONTS_SUBST);g" $(GSTREAMER_NDK_BUILD_PATH)/GStreamer.java | \ - $(SED) "s;@INCLUDE_CA_CERTIFICATES@;$(GSTREAMER_INCLUDE_CA_CERTIFICATES_SUBST);g" | \ - $(SED) "s;@INCLUDE_COPY_FILE@;$(GSTREAMER_COPY_FILE_SUBST);g" \ + @$(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 copyfontsres_$(TARGET_ARCH_ABI): |