diff options
| author | Dan Albert <danalbert@google.com> | 2019-09-18 07:37:50 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-09-18 14:52:18 -0700 |
| commit | 762957c4e2aab2cf5b2bec4c4d820dd9dd0225cd (patch) | |
| tree | c0232ca843b8f297e79a22f91b61e5c7a7a5dc87 /build | |
| parent | 6e7e51f684f0512ce271aa8d670626527b1c5c53 (diff) | |
| download | ndk-762957c4e2aab2cf5b2bec4c4d820dd9dd0225cd.tar.gz | |
Revert "Revert "Switch to llvm-ar.""
This reverts commit 0bb683e8c79290d0b0f5e46ca4c3a13baf582389.
Reason for revert: Bug this was triggering should be fixed.
Change-Id: Ib621efa8566215a4dff469ab2dbab1ec3d886300
Diffstat (limited to 'build')
| -rw-r--r-- | build/cmake/android.toolchain.cmake | 5 | ||||
| -rw-r--r-- | build/core/default-build-commands.mk | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake index 0a87d655e..935aaa18a 100644 --- a/build/cmake/android.toolchain.cmake +++ b/build/cmake/android.toolchain.cmake @@ -439,9 +439,10 @@ set(CMAKE_ASM_COMPILER_TARGET ${ANDROID_LLVM_TRIPLE}) set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${ANDROID_TOOLCHAIN_ROOT}") set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${ANDROID_TOOLCHAIN_ROOT}") set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${ANDROID_TOOLCHAIN_ROOT}") -set(ANDROID_AR "${ANDROID_TOOLCHAIN_PREFIX}ar${ANDROID_TOOLCHAIN_SUFFIX}") +set(ANDROID_AR + "${ANDROID_TOOLCHAIN_ROOT}/bin/llvm-ar${ANDROID_TOOLCHAIN_SUFFIX}") set(ANDROID_RANLIB - "${ANDROID_TOOLCHAIN_PREFIX}ranlib${ANDROID_TOOLCHAIN_SUFFIX}") + "${ANDROID_TOOLCHAIN_ROOT}/bin/llvm-ranlib${ANDROID_TOOLCHAIN_SUFFIX}") set(ANDROID_STRIP "${ANDROID_TOOLCHAIN_ROOT}/bin/llvm-strip${ANDROID_TOOLCHAIN_SUFFIX}") diff --git a/build/core/default-build-commands.mk b/build/core/default-build-commands.mk index 1f964aa8e..ce36be38d 100644 --- a/build/core/default-build-commands.mk +++ b/build/core/default-build-commands.mk @@ -159,7 +159,7 @@ TARGET_ASMFLAGS = TARGET_LD = $(TOOLCHAIN_PREFIX)ld TARGET_LDFLAGS := -TARGET_AR = $(TOOLCHAIN_PREFIX)ar +TARGET_AR = $(LLVM_TOOLCHAIN_PREFIX)llvm-ar$(HOST_EXEEXT) TARGET_ARFLAGS := crsD TARGET_STRIP = $(LLVM_TOOLCHAIN_PREFIX)llvm-strip$(HOST_EXEEXT) |