diff options
| author | Xavi Artigas <xartigas.bugzilla@gmail.com> | 2016-03-01 09:27:00 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-03-01 14:13:48 +0200 |
| commit | 551f0d41809ea06064aae3fe88e966be9a744d11 (patch) | |
| tree | b1bb4fedfdf5a1ff0bf3b510c24fd390e8387ec1 | |
| parent | 571aeb5b091633c605a2128a2c5e030069486fa8 (diff) | |
android: Fix extraneous spaces in path when copying plugins' java code
Required on Windows, otherwise copying does not work at all.
https://bugzilla.gnome.org/show_bug.cgi?id=762913
| -rwxr-xr-x | data/ndk-build/gstreamer-1.0.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 7d529c80..b9fb54cc 100755 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -142,7 +142,7 @@ GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,realmedia,rmdemux) GSTREAMER_PLUGINS_CLASSES := $(strip \ $(subst $(GSTREAMER_NDK_BUILD_PATH),, \ - $(foreach plugin, $(GSTREAMER_PLUGINS), \ + $(foreach plugin,$(GSTREAMER_PLUGINS), \ $(wildcard $(GSTREAMER_NDK_BUILD_PATH)$(plugin)/*.java)))) GSTREAMER_PLUGINS_WITH_CLASSES := $(strip \ @@ -243,11 +243,9 @@ copyjavasource_$(TARGET_ARCH_ABI): @$(call host-mkdir,$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer) @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/GStreamer.java,$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer) @$(foreach plugin,$(GSTREAMER_PLUGINS_WITH_CLASSES), \ - $(call host-mkdir, $(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/$(plugin));) + $(call host-mkdir,$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/$(plugin));) @$(foreach file,$(GSTREAMER_PLUGINS_CLASSES), \ - $(call host-cp, \ - $(GSTREAMER_NDK_BUILD_PATH)$(file), \ - $(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/$(file));) + $(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)$(file),$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/$(file));) ifeq ($(GSTREAMER_INCLUDE_FONTS),yes) @$(HOST_SED) -i "s;@INCLUDE_FONTS@;;g" $(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/GStreamer.java else |