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