commit 5ecc71de216ccac81e34efdecdaf60e9a3ac6948
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 26 00:12:55 2022 -0800
committer Linux Build Service Account <lnxbuild@localhost> Wed Jan 26 00:12:55 2022 -0800
tree 7249c4c0104ce44f31fa68c0aafe46fa675e8bee
parent e239e99372138fcebe993485d05bb2e40f223c14
parent c9de0a84fe765faa2e8ca08f05eb8bd12c8e7f6b

Merge c9de0a84fe765faa2e8ca08f05eb8bd12c8e7f6b on remote branch

Change-Id: I782a5b342bfad1672f571c36e7bb214dc485884d

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"