diff options
| author | Dan Albert <danalbert@google.com> | 2019-09-23 13:21:47 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-09-23 13:24:03 -0700 |
| commit | 9f292c26c475f9983394b923cef5a7618041b8ff (patch) | |
| tree | 4aa27a60b7f41103022a3e1dc8ca14861e98a8f2 /build | |
| parent | 680f6910a11c6263094bb3c10d1e7ded5827eda7 (diff) | |
| download | ndk-9f292c26c475f9983394b923cef5a7618041b8ff.tar.gz | |
Revert "Switch to llvm-strip, advocate its use."
This reverts commit e043c269d3c0090954f2f405bfe9f6bffcdf6b9a.
Test: ./checkbuild.py && ./run_tests.py
Bug: https://github.com/android/ndk/issues/1083
Change-Id: Ida9b868112d4ef2ca00f6e9aa9e12c6845021289
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, 5 insertions, 8 deletions
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake index 84cca7f6e..907c302e8 100644 --- a/build/cmake/android.toolchain.cmake +++ b/build/cmake/android.toolchain.cmake @@ -442,8 +442,6 @@ 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 @@ -565,11 +563,10 @@ 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_STRIP "${ANDROID_STRIP}" CACHE FILEPATH "Strip") +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_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 9c29ca346..13d76a53b 100644 --- a/build/core/default-build-commands.mk +++ b/build/core/default-build-commands.mk @@ -164,7 +164,7 @@ TARGET_LDFLAGS := TARGET_AR = $(TOOLCHAIN_PREFIX)ar TARGET_ARFLAGS := crsD -TARGET_STRIP = $(LLVM_TOOLCHAIN_PREFIX)llvm-strip$(HOST_EXEEXT) +TARGET_STRIP = $(TOOLCHAIN_PREFIX)strip TARGET_OBJ_EXTENSION := .o TARGET_LIB_EXTENSION := .a |