diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-09-25 00:06:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-25 00:06:50 +0000 |
| commit | 29c41138c11c4059a7b9224c35f6f94d9fe79b04 (patch) | |
| tree | 317cf80600d41028e2414ec97eba23f206519829 /build | |
| parent | d9b023f38d2f3ccafc27f0a3c45f7460f7f3ec94 (diff) | |
| parent | f8f36fae65d46b99bfb0cb782a6cccc5acccbba9 (diff) | |
| download | ndk-29c41138c11c4059a7b9224c35f6f94d9fe79b04.tar.gz | |
Merge "Cleanup -fno-addrsig use."
Diffstat (limited to 'build')
| -rw-r--r-- | build/cmake/android.toolchain.cmake | 3 | ||||
| -rw-r--r-- | build/core/default-build-commands.mk | 3 | ||||
| -rwxr-xr-x | build/tools/make_standalone_toolchain.py | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake index 907c302e8..5ad98d95c 100644 --- a/build/cmake/android.toolchain.cmake +++ b/build/cmake/android.toolchain.cmake @@ -477,9 +477,6 @@ if(ANDROID_ABI STREQUAL x86 AND ANDROID_PLATFORM_LEVEL LESS 24) list(APPEND ANDROID_COMPILER_FLAGS -mstackrealign) endif() -# TODO: Remove when https://github.com/android-ndk/ndk/issues/884 is fixed. -list(APPEND ANDROID_COMPILER_FLAGS -fno-addrsig) - list(APPEND ANDROID_COMPILER_FLAGS -D_FORTIFY_SOURCE=2) # STL specific flags. diff --git a/build/core/default-build-commands.mk b/build/core/default-build-commands.mk index 13d76a53b..4a71f5e0b 100644 --- a/build/core/default-build-commands.mk +++ b/build/core/default-build-commands.mk @@ -125,9 +125,6 @@ GLOBAL_CFLAGS += \ -Wno-invalid-command-line-argument \ -Wno-unused-command-line-argument \ -# TODO: Remove when https://github.com/android-ndk/ndk/issues/884 is fixed. -GLOBAL_CFLAGS += -fno-addrsig - GLOBAL_CFLAGS += -D_FORTIFY_SOURCE=2 GLOBAL_LDFLAGS = \ diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py index 64f8df7d0..b6b86075d 100755 --- a/build/tools/make_standalone_toolchain.py +++ b/build/tools/make_standalone_toolchain.py @@ -133,9 +133,6 @@ def make_clang_scripts(install_dir, arch, api, windows): if arch == 'i686' and api < 24: flags += ' -mstackrealign' - # TODO: Remove when https://github.com/android-ndk/ndk/issues/884 is fixed. - flags += ' -fno-addrsig' - cxx_flags = str(flags) clang_path = os.path.join(install_dir, 'bin/clang') |