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 | 20fa386d3323bc09e29f3995b677c98e15ce18bc (patch) | |
| tree | 9012965ab5a7d0c7d0cb83d0f6137f672e09f609 /ots.target.darwin-arm64.mk | |
| parent | c97ad1ac16a71a8cb36663665879c26f0e7e0d9a (diff) | |
| download | ots-20fa386d3323bc09e29f3995b677c98e15ce18bc.tar.gz | |
Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I34739eb041976d8d3e0bc2579531109faa1e5ee6
Diffstat (limited to 'ots.target.darwin-arm64.mk')
| -rw-r--r-- | ots.target.darwin-arm64.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index 218ccbe..11af240 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -63,7 +63,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -141,6 +140,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 \ @@ -156,7 +156,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -235,6 +234,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 \ @@ -258,6 +258,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 \ @@ -272,6 +273,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 \ |