diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-28 02:35:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-28 02:35:38 +0000 |
commit | 98e215f47fde95dc5a8f8bb8a169458383d14610 (patch) | |
tree | 7bd59bf822ad95016f9c87e154dd873490931aca | |
parent | 42957c926eb1f0d22fb71aa7b29f34b164802604 (diff) | |
parent | eb5a07ecd313ba7cdba7be40c2022bf69a46d179 (diff) | |
download | curl-98e215f47fde95dc5a8f8bb8a169458383d14610.tar.gz |
Merge "[androidconfigure] Read current clang version instead of hardcoding" am: a9bd6e759e am: eb5a07ecd3
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775
Change-Id: I6225f1cd0eba807ed16a0b2783af610e3e8e9a0b
-rwxr-xr-x | androidconfigure | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/androidconfigure b/androidconfigure index 480d6a198..e8e15f548 100755 --- a/androidconfigure +++ b/androidconfigure @@ -13,8 +13,9 @@ cd $(dirname "$0") HOST="arm-linux-androideabi" T="${ANDROID_BUILD_TOP}" -export CC="${T}/prebuilts/clang/host/linux-x86/clang-r428724/bin/clang" -export LD="${T}/prebuilts/clang/host/linux-x86/clang-r428724/bin/lld" +CLANG_VERSION="$(exec ${T}/build/soong/scripts/get_clang_version.py)" +export CC="${T}/prebuilts/clang/host/linux-x86/${CLANG_VERSION}/bin/clang" +export LD="${T}/prebuilts/clang/host/linux-x86/${CLANG_VERSION}/bin/lld" CFLAGS=( "-isystem ${T}/external/libcxx/include" |