commit 3087f614137b31a9513740c4a02455590d06d4a8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 28 03:23:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 28 03:23:03 2021 +0000
tree 7bd59bf822ad95016f9c87e154dd873490931aca
parent 13d56931c11177b612897420e326374ba6fee902
parent 849082a60867156db868dcb93b67125b84997600

Merge "[androidconfigure] Read current clang version instead of hardcoding" am: a9bd6e759e am: eb5a07ecd3 am: 98e215f47f am: 80fd9f6e75 am: 849082a608

Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775

Change-Id: If4b7d31218a6d9f558b301016a630e788f3cf9e5

androidconfigure

diff --git a/androidconfigure b/androidconfigure
index 480d6a1..e8e15f5 100755
--- a/androidconfigure
+++ b/androidconfigure
@@ -13,8 +13,9 @@
 
 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"