summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2015-08-14 18:44:52 +0200
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2015-08-14 18:48:25 +0200
commitc5d237e9d0347ae48b8517b1cd12d648c3d87c85 (patch)
tree3431d0413610c9e24d14af679323f4cd40ffc911 /data
parent6f1680681a208444330c31eca3abeec8b850ead0 (diff)
gst-android: ld.gold is now available for ARM64
In the latest NDK ld.gold is now available, so enable it. Also, ld.mcld was not usable as the "fix" parameters are expected to be "-fix-cortex..." for this linker, while it's harcoded as "--fix-cortex..." in the GCC build. This fixex linking Android application for ARM64.
Diffstat (limited to 'data')
-rwxr-xr-xdata/ndk-build/gstreamer-1.0.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk
index dfbc8f71..6d0efc45 100755
--- a/data/ndk-build/gstreamer-1.0.mk
+++ b/data/ndk-build/gstreamer-1.0.mk
@@ -88,11 +88,7 @@ GSTREAMER_ANDROID_SO := $(GSTREAMER_BUILD_DIR)/lib$(GSTREAMER_ANDROID_M
GSTREAMER_ANDROID_C := $(GSTREAMER_BUILD_DIR)/$(GSTREAMER_ANDROID_MODULE_NAME).c
GSTREAMER_ANDROID_C_IN := $(GSTREAMER_NDK_BUILD_PATH)/gstreamer_android-1.0.c.in
GSTREAMER_DEPS := $(GSTREAMER_EXTRA_DEPS) gstreamer-1.0
-ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
- GSTREAMER_LD := -fuse-ld=mcld
-else
- GSTREAMER_LD := -fuse-ld=gold
-endif
+GSTREAMER_LD := -fuse-ld=gold
################################
# NDK Build Prebuilt library #