diff options
| author | Jan Schmidt <jan@centricular.com> | 2019-08-05 23:49:03 +1000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2019-08-12 06:38:35 +0000 |
| commit | 8988e82317b223b34472fe2f616bfc50c0937f91 (patch) | |
| tree | 673a7e55e358784e7cc600bee8220b58195d6d7d /data/ndk-build/gstreamer-1.0.mk | |
| parent | defe3d3b4492e39b05460fe91429a375fdad10f2 (diff) | |
android: Adjust gstreamer-1.0.mk for NDK r20
Fix NDK build with newest NDK. Cerbero itself has a
separate problem trying to use r20, but this enables
using the GStreamer SDK with NDK 20.
Diffstat (limited to 'data/ndk-build/gstreamer-1.0.mk')
| -rw-r--r-- | data/ndk-build/gstreamer-1.0.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 02e3248f..b33e02ff 100644 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -162,22 +162,28 @@ GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS) # https://android.googlesource.com/platform/ndk/+/fa8c1b4338c1bef2813ecee0ee298e9498a1aaa7 ifdef SYSROOT SYSROOT_GST_INC := $(SYSROOT) - SYSROOT_GST_LINK := $(SYSROOT) + SYSROOT_GST_LINK_ARG := --sysroot=$(SYSROOT) else - ifdef SYSROOT_INC - $(call assert-defined, SYSROOT_LINK) + ifdef SYSROOT_LINK ifdef SYSROOT_LINK SYSROOT_GST_INC := $(SYSROOT_INC) - SYSROOT_GST_LINK := $(SYSROOT_LINK) + SYSROOT_GST_LINK_ARG := --sysroot=$(SYSROOT_LINK) endif else - SYSROOT_GST_INC := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-$(TARGET_ARCH) - SYSROOT_GST_LINK := $(SYSROOT_GST_INC) + ifdef SYSROOT_LIB_DIR + # https://android.googlesource.com/platform/ndk/+/8afb627a222005272e61d4b222b50c69e760d77d + # introduced SYSROOT_LIB_DIR + SYSROOT_GST_INC := $(SYSROOT_INC) + SYSROOT_GST_LINK_ARG := -L$(SYSROOT_API_LIB_DIR) -L$(SYSROOT_LIB_DIR) + else + SYSROOT_GST_INC := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-$(TARGET_ARCH) + SYSROOT_GST_LINK_ARG := -L$(SYSROOT_GST_INC) + endif endif endif # Create the link command -GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CXX) $(GLOBAL_LDFLAGS) $(TARGET_LDFLAGS) -nostdlib++ -shared --sysroot=$(SYSROOT_GST_LINK) \ +GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CXX) $(GLOBAL_LDFLAGS) $(TARGET_LDFLAGS) -nostdlib++ -shared $(SYSROOT_GST_LINK_ARG) \ -o $(GSTREAMER_ANDROID_SO) $(GSTREAMER_ANDROID_O) \ -L$(GSTREAMER_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) -L$(CXX_SHARED_ROOT) \ $(GSTREAMER_ANDROID_LIBS), $(GSTREAMER_LD)) -Wl,-no-undefined $(GSTREAMER_LD) |