diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2015-08-09 14:35:27 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2015-08-14 05:56:54 -0400 |
| commit | c4491838b5a9598a70721f62640b887c2178029b (patch) | |
| tree | 9aff84a26561d006464c1ac69b987354f3ccd8d6 | |
| parent | 261d1f2159ff88db7cfab693aa1a1d6ed017582f (diff) | |
android: Import definition of HOST_SED
HOST_SED definition is gone in r10e but sed is still prebuilt, so
import it's definition in our own makefile.
https://bugzilla.gnome.org/show_bug.cgi?id=750162
| -rwxr-xr-x | data/ndk-build/gstreamer-1.0.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 29d3326c..dfbc8f71 100755 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -63,6 +63,16 @@ include $(GSTREAMER_NDK_BUILD_PATH)/tools.mk G_IO_MODULES_PATH := $(GSTREAMER_ROOT)/lib/gio/modules/static # Host tools +HOST_SED := $(strip $(NDK_HOST_SED)) +ifdef HOST_PREBUILT + ifndef HOST_SED + HOST_SED := $(strip $(wildcard $(HOST_PREBUILT)/sed$(HOST_EXEEXT))) + endif +endif +ifndef HOST_SED + HOST_CMP := sed +endif + ifeq ($(HOST_OS),windows) HOST_SED := $(GSTREAMER_NDK_BUILD_PATH)/tools/windows/sed GSTREAMER_LD := |