diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-17 13:59:05 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-17 13:59:05 +0000 |
| commit | 4f684e9d5b3f522968e06dc7f27137e06e13eb49 (patch) | |
| tree | 2f53e8c7b71986bc7a2e08ce6ee893136db7b644 /system_wrappers/source/cpu_features_android.target.linux-arm.mk | |
| parent | c5e7779a5fe0a0b2b8f14ce83ad5bcaccd9eeaf6 (diff) | |
| download | webrtc-4f684e9d5b3f522968e06dc7f27137e06e13eb49.tar.gz | |
Update makefiles after merge of Chromium at 257420
This commit was generated by merge_from_chromium.py.
Change-Id: I976ab11a93b7c30cb293371b90a8b50299b53d8f
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.linux-arm.mk')
| -rw-r--r-- | system_wrappers/source/cpu_features_android.target.linux-arm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index b74d1108..7bf6f08d 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -233,6 +233,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -244,7 +245,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -252,6 +252,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -266,7 +267,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel |