diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-11 17:45:37 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-11 17:45:37 +0000 |
| commit | 40d8f859f097f75c5bfd85ac8f04c3b983afe0e1 (patch) | |
| tree | b867380cef0e87c5eb0d8f79957119437ca25441 /modules/remote_bitrate_estimator.target.darwin-arm64.mk | |
| parent | 8f88adf74ee77ddc03c123898e1b0790f67aa4cd (diff) | |
| download | webrtc-40d8f859f097f75c5bfd85ac8f04c3b983afe0e1.tar.gz | |
Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I03e28d2901e702a21f5ad8f0aba69055baff2d94
Diffstat (limited to 'modules/remote_bitrate_estimator.target.darwin-arm64.mk')
| -rw-r--r-- | modules/remote_bitrate_estimator.target.darwin-arm64.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/remote_bitrate_estimator.target.darwin-arm64.mk b/modules/remote_bitrate_estimator.target.darwin-arm64.mk index e4163764..929d9367 100644 --- a/modules/remote_bitrate_estimator.target.darwin-arm64.mk +++ b/modules/remote_bitrate_estimator.target.darwin-arm64.mk @@ -31,7 +31,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -127,6 +126,7 @@ LOCAL_C_INCLUDES_Debug := \ # Flags passed to only C++ (and not C) files. LOCAL_CPPFLAGS_Debug := \ + -fno-exceptions \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ @@ -142,7 +142,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -239,6 +238,7 @@ LOCAL_C_INCLUDES_Release := \ # Flags passed to only C++ (and not C) files. LOCAL_CPPFLAGS_Release := \ + -fno-exceptions \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ @@ -262,6 +262,7 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ + -Wl,--dynamic-linker=/system/bin/linker64 \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ @@ -276,6 +277,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ + -Wl,--dynamic-linker=/system/bin/linker64 \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ |