diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-28 01:54:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-28 01:54:17 +0000 |
| commit | a9bd6e759e95ef0b279ffb13c601b19f113c152c (patch) | |
| tree | 7bd59bf822ad95016f9c87e154dd873490931aca | |
| parent | c46644915e449544cec640ddaecbcc4503ecf5d6 (diff) | |
| parent | 7519f995e4d8a66208accf29d4d7bd1b7f78e6b6 (diff) | |
| download | curl-a9bd6e759e95ef0b279ffb13c601b19f113c152c.tar.gz | |
Merge "[androidconfigure] Read current clang version instead of hardcoding"
| -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" |