diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-28 02:52:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-28 02:52:05 +0000 |
| commit | 80fd9f6e7587419942588f23b8c9eabdb1c581da (patch) | |
| tree | 7bd59bf822ad95016f9c87e154dd873490931aca | |
| parent | 28564d042041f0983eebbfb089cce7835dd15200 (diff) | |
| parent | 98e215f47fde95dc5a8f8bb8a169458383d14610 (diff) | |
| download | curl-80fd9f6e7587419942588f23b8c9eabdb1c581da.tar.gz | |
Merge "[androidconfigure] Read current clang version instead of hardcoding" am: a9bd6e759e am: eb5a07ecd3 am: 98e215f47f
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775
Change-Id: Iff6a27b2631f636ac0cc040c17bd41829f86227e
| -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" |