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 | |
| 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')
12 files changed, 24 insertions, 24 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk index b74d1108..7bf6f08d 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-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 diff --git a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk index 43865837..9ca997ff 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk @@ -231,6 +231,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -240,7 +241,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -248,6 +248,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -260,7 +261,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk index d74c13a3..809ff742 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk @@ -227,6 +227,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -236,7 +237,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -244,6 +244,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -256,7 +257,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel 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 diff --git a/system_wrappers/source/cpu_features_android.target.linux-mips.mk b/system_wrappers/source/cpu_features_android.target.linux-mips.mk index 43865837..9ca997ff 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-mips.mk @@ -231,6 +231,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -240,7 +241,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -248,6 +248,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -260,7 +261,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86.mk b/system_wrappers/source/cpu_features_android.target.linux-x86.mk index d74c13a3..809ff742 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86.mk @@ -227,6 +227,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -236,7 +237,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -244,6 +244,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -256,7 +257,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk index f482b356..0332eeac 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk @@ -268,6 +268,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -279,7 +280,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 \ @@ -287,6 +287,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -301,7 +302,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/system_wrappers.target.darwin-mips.mk b/system_wrappers/source/system_wrappers.target.darwin-mips.mk index 81ada300..8be271bc 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-mips.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-mips.mk @@ -266,6 +266,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -275,7 +276,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -283,6 +283,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -295,7 +296,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86.mk b/system_wrappers/source/system_wrappers.target.darwin-x86.mk index 6a776c75..e1e5b4a6 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86.mk @@ -262,6 +262,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -271,7 +272,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -279,6 +279,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -291,7 +292,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk index f482b356..0332eeac 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk @@ -268,6 +268,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -279,7 +280,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 \ @@ -287,6 +287,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -301,7 +302,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk index 81ada300..8be271bc 100644 --- a/system_wrappers/source/system_wrappers.target.linux-mips.mk +++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk @@ -266,6 +266,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -275,7 +276,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -283,6 +283,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -295,7 +296,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel diff --git a/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk index 6a776c75..e1e5b4a6 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk @@ -262,6 +262,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -271,7 +272,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -279,6 +279,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -291,7 +292,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel |