diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-03-25 12:01:59 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-03-25 12:45:11 +0100 |
| commit | 71950893360f6511e9c991a0f7d7ae1b019c6165 (patch) | |
| tree | e665787992b97cbbf86616c91cf85d899a0d48e8 | |
| parent | 999b44b62cf019a6258be26795a8e335de66d339 (diff) | |
ndk-build: add the sysroot variable which is not set in newer NDK
See: https://android.googlesource.com/platform/ndk/+/fa8c1b4338c1bef2813ecee0ee298e9498a1aaa7
| -rwxr-xr-x | data/ndk-build/gstreamer.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/data/ndk-build/gstreamer.mk b/data/ndk-build/gstreamer.mk index 2969b97..3d2581b 100755 --- a/data/ndk-build/gstreamer.mk +++ b/data/ndk-build/gstreamer.mk @@ -144,6 +144,13 @@ GSTREAMER_ANDROID_WHOLE_AR := $(call pkg-config-get-libs-no-deps,$(GSTREAMER_D GSTREAMER_ANDROID_LIBS := $(call fix-deps,-lgiognutls, -lhogweed) GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS)) -I$(GSTREAMER_SDK_ROOT)/include +# In newer NDK, SYSROOT is replaced by SYSROOT_INC and SYSROOT_LINK, which +# now points to the root directory. But this will probably change in the future from: +# https://android.googlesource.com/platform/ndk/+/fa8c1b4338c1bef2813ecee0ee298e9498a1aaa7 +ifndef SYSROOT + SYSROOT := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-$(TARGET_ARCH) +endif + # Create the link command GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CC) $(LDFLAGS) -shared --sysroot=$(SYSROOT) \ -o $(GSTREAMER_ANDROID_SO) $(GSTREAMER_ANDROID_O) \ |