diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-12-17 23:13:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 23:13:58 +0000 |
| commit | f4a11ec4304282df65be16b2eda368329f3432b4 (patch) | |
| tree | 7f0ea0094e4ae033409ab2a259380a3fb966f26e | |
| parent | 04a28c93bf2d36dc0c0d3c397a477578325b2368 (diff) | |
| parent | b5c8d0bc8c69a0854dc39ed2e8bedfafb20f1ee5 (diff) | |
| download | iproute2-marshmallow-dr-dragon-release.tar.gz | |
am b5c8d0bc: am 38dba7db: Merge "Temporarily disable gc-sections optimization"android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaselinaro-m-gcc7linaro-android-6.0
* commit 'b5c8d0bc8c69a0854dc39ed2e8bedfafb20f1ee5':
Temporarily disable gc-sections optimization
| -rw-r--r-- | lib/Android.mk | 3 | ||||
| -rw-r--r-- | tc/Android.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/Android.mk b/lib/Android.mk index 75d26e22..f0b12ade 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -35,6 +35,9 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ -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) diff --git a/tc/Android.mk b/tc/Android.mk index 9ac59a59..f137d3ee 100644 --- a/tc/Android.mk +++ b/tc/Android.mk @@ -20,5 +20,8 @@ LOCAL_CFLAGS := -O2 -g -W -Wall -Wno-pointer-arith -Wno-sign-compare -Werror \ -Wno-unused-parameter \ -Wno-missing-field-initializers +# This is a work around for b/18403920 +LOCAL_LDFLAGS := -Wl,--no-gc-sections + include $(BUILD_EXECUTABLE) |