commit f4a11ec4304282df65be16b2eda368329f3432b4
author Dmitriy Ivanov <dimitry@google.com> Wed Dec 17 23:13:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 17 23:13:58 2014 +0000
tree 7f0ea0094e4ae033409ab2a259380a3fb966f26e
parent 04a28c93bf2d36dc0c0d3c397a477578325b2368
parent b5c8d0bc8c69a0854dc39ed2e8bedfafb20f1ee5

am b5c8d0bc: am 38dba7db: Merge "Temporarily disable gc-sections optimization"

* commit 'b5c8d0bc8c69a0854dc39ed2e8bedfafb20f1ee5':
  Temporarily disable gc-sections optimization

lib/Android.mk

diff --git a/lib/Android.mk b/lib/Android.mk
index 75d26e2..f0b12ad 100644
--- a/lib/Android.mk
+++ b/lib/Android.mk
@@ -35,6 +35,9 @@
 	-Wno-unused-parameter \
 	-Werror
 
+# This is a work around for b/18403920
+LOCAL_LDFLAGS := -Wl,--no-gc-sections
+
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)

tc/Android.mk

diff --git a/tc/Android.mk b/tc/Android.mk
index 9ac59a5..f137d3e 100644
--- a/tc/Android.mk
+++ b/tc/Android.mk
@@ -20,5 +20,8 @@
     -Wno-unused-parameter \
     -Wno-missing-field-initializers
 
+# This is a work around for b/18403920
+LOCAL_LDFLAGS := -Wl,--no-gc-sections
+
 include $(BUILD_EXECUTABLE)