diff options
| author | Dan Albert <danalbert@google.com> | 2019-12-05 13:32:35 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-12-05 13:44:34 -0800 |
| commit | c03957fe68caf478a7f93d2149fb7fbc406f3678 (patch) | |
| tree | 825ee3a639df64da96b771aa230a8cce215171b6 /build | |
| parent | 7c84a347d2cd4fc0eef6f7d915430fcdff1eb636 (diff) | |
| download | ndk-c03957fe68caf478a7f93d2149fb7fbc406f3678.tar.gz | |
Revert "Revert "Switch to llvm-strip, advocate its use.""
This reverts commit 9f292c26c475f9983394b923cef5a7618041b8ff.
Test: ./checkbuild.py && ./run_tests.py
Bug: https://github.com/android/ndk/issues/843
Change-Id: Iefb6108bc61ed24cd911860b1f75b266574ddd2d
Diffstat (limited to 'build')
| -rw-r--r-- | build/cmake/android.toolchain.cmake | 11 | ||||
| -rw-r--r-- | build/core/default-build-commands.mk | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake index cf5312f0e..32a1efd7e 100644 --- a/build/cmake/android.toolchain.cmake +++ b/build/cmake/android.toolchain.cmake @@ -442,6 +442,8 @@ set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${ANDROID_TOOLCHAIN_ROOT}") set(ANDROID_AR "${ANDROID_TOOLCHAIN_PREFIX}ar${ANDROID_TOOLCHAIN_SUFFIX}") set(ANDROID_RANLIB "${ANDROID_TOOLCHAIN_PREFIX}ranlib${ANDROID_TOOLCHAIN_SUFFIX}") +set(ANDROID_STRIP + "${ANDROID_TOOLCHAIN_ROOT}/bin/llvm-strip${ANDROID_TOOLCHAIN_SUFFIX}") # Generic flags. list(APPEND ANDROID_COMPILER_FLAGS @@ -573,10 +575,11 @@ if(ANDROID_CCACHE) set(CMAKE_C_COMPILER_LAUNCHER "${ANDROID_CCACHE}") set(CMAKE_CXX_COMPILER_LAUNCHER "${ANDROID_CCACHE}") endif() -set(CMAKE_C_COMPILER "${ANDROID_C_COMPILER}") -set(CMAKE_CXX_COMPILER "${ANDROID_CXX_COMPILER}") -set(CMAKE_AR "${ANDROID_AR}" CACHE FILEPATH "Archiver") -set(CMAKE_RANLIB "${ANDROID_RANLIB}" CACHE FILEPATH "Ranlib") +set(CMAKE_C_COMPILER "${ANDROID_C_COMPILER}") +set(CMAKE_CXX_COMPILER "${ANDROID_CXX_COMPILER}") +set(CMAKE_AR "${ANDROID_AR}" CACHE FILEPATH "Archiver") +set(CMAKE_RANLIB "${ANDROID_RANLIB}" CACHE FILEPATH "Ranlib") +set(CMAKE_STRIP "${ANDROID_STRIP}" CACHE FILEPATH "Strip") set(_CMAKE_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_PREFIX}") if(ANDROID_ABI STREQUAL "x86" OR ANDROID_ABI STREQUAL "x86_64") diff --git a/build/core/default-build-commands.mk b/build/core/default-build-commands.mk index 138707bdb..0024ae961 100644 --- a/build/core/default-build-commands.mk +++ b/build/core/default-build-commands.mk @@ -161,7 +161,7 @@ TARGET_LDFLAGS := TARGET_AR = $(TOOLCHAIN_PREFIX)ar TARGET_ARFLAGS := crsD -TARGET_STRIP = $(TOOLCHAIN_PREFIX)strip +TARGET_STRIP = $(LLVM_TOOLCHAIN_PREFIX)llvm-strip$(HOST_EXEEXT) TARGET_OBJ_EXTENSION := .o TARGET_LIB_EXTENSION := .a |