diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-05-04 21:19:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-04 21:19:15 +0000 |
| commit | 24457b84666de7842ef8720bd0e76739de59cda5 (patch) | |
| tree | 7ecb0ac7e03c67e4acf8b3b372d282d17f9cf4fa | |
| parent | dd762af02a91597c3eee9d5cb8469a7450c891ef (diff) | |
| parent | fa471fb3f886a95bfc35bae578c1a2c251f45732 (diff) | |
| download | ndk-24457b84666de7842ef8720bd0e76739de59cda5.tar.gz | |
Merge "Hide libgcc in all binaries."
| -rw-r--r-- | build/cmake/android.toolchain.cmake | 2 | ||||
| -rw-r--r-- | build/core/default-build-commands.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake index 7c5246ab5..c7fa8e496 100644 --- a/build/cmake/android.toolchain.cmake +++ b/build/cmake/android.toolchain.cmake @@ -499,7 +499,7 @@ elseif(ANDROID_STL MATCHES "^c\\+\\+_") set(ANDROID_STL_PREFIX llvm-libc++) if(ANDROID_ABI MATCHES "^armeabi") list(APPEND ANDROID_LINKER_FLAGS - -Wl,--exclude-libs,libunwind.a) + -Wl,--exclude-libs,libunwind.a -Wl,--exclude-libs,libgcc.a) endif() list(APPEND ANDROID_COMPILER_FLAGS_CXX -std=c++11) diff --git a/build/core/default-build-commands.mk b/build/core/default-build-commands.mk index 3004662e2..a225f64be 100644 --- a/build/core/default-build-commands.mk +++ b/build/core/default-build-commands.mk @@ -109,7 +109,7 @@ cmd-strip = $(PRIVATE_STRIP) --strip-unneeded $(call host-path,$1) # The command objcopy --add-gnu-debuglink= will be needed for Valgrind cmd-add-gnu-debuglink = $(PRIVATE_OBJCOPY) --add-gnu-debuglink=$(strip $(call host-path,$2)) $(call host-path,$1) -TARGET_LIBGCC = -lgcc +TARGET_LIBGCC = -lgcc -Wl,--exclude-libs,libgcc.a TARGET_LDLIBS := -lc -lm # |