Fix duplicate LOCAL_LDFLAGS at link time.
Change-Id: I278aeb75c9db15807bb3a583996068ed671912ee
diff --git a/build/core/build-binary.mk b/build/core/build-binary.mk
index d796b66..27069e2 100644
--- a/build/core/build-binary.mk
+++ b/build/core/build-binary.mk
@@ -88,7 +88,7 @@
# of a binary that uses undefined symbols.
#
ifneq ($(LOCAL_ALLOW_UNDEFINED_SYMBOLS),true)
- LOCAL_LDFLAGS += $(LOCAL_LDFLAGS) $($(my)NO_UNDEFINED_LDFLAGS)
+ LOCAL_LDFLAGS += $($(my)NO_UNDEFINED_LDFLAGS)
endif
# If LOCAL_DISABLE_NO_EXECUTE is not true, we disable generated code from running from
diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT
index d9c7058..b0f1e48 100644
--- a/docs/CHANGES.TXT
+++ b/docs/CHANGES.TXT
@@ -124,6 +124,9 @@
rebuilding *everything* when you switch between these two modes, which can
be a real time-saver for complex projects.
+- Fixed a bug that duplicated the LOCAL_LDFLAGS in the final link command
+ when LOCAL_ALLOW_UNDEFINED_SYMBOLS was not set to 'true'
+
-------------------------------------------------------------------------------
android-ndk-r4b
