diff options
author | Haibo Huang <hhb@google.com> | 2019-01-08 14:27:10 -0800 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2019-01-14 23:02:29 +0000 |
commit | 21926d584a5b118cbff81a9fb4329059011f87c6 (patch) | |
tree | 421b037a92a6d5209e8e4c30e8a830c262abe6d4 /androidconfigure | |
parent | 98caa6f514b401764e3ac76041ff7e006f109e8c (diff) | |
download | curl-21926d584a5b118cbff81a9fb4329059011f87c6.tar.gz |
Upgrade curl from 7.62.0 to 7.63.0
Test: build, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Iecd6120501e7a6d2c8b83c2891de62163a30f08a
Diffstat (limited to 'androidconfigure')
-rwxr-xr-x | androidconfigure | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/androidconfigure b/androidconfigure index 2ea0df743..7f458f364 100755 --- a/androidconfigure +++ b/androidconfigure @@ -12,19 +12,17 @@ fi cd $(dirname "$0") HOST="arm-linux-androideabi" -export CC="${ANDROID_TOOLCHAIN}/${HOST}-gcc" -export LD="${ANDROID_TOOLCHAIN}/${HOST}-ld" - T="${ANDROID_BUILD_TOP}" +export CC="${T}/prebuilts/clang/host/linux-x86/clang-r346389b/bin/clang" +export LD="${T}/prebuilts/clang/host/linux-x86/clang-r346389b/bin/lld" + CFLAGS=( "-isystem ${T}/external/libcxx/include" "-isystem ${T}/bionic/libc/include/" "-isystem ${T}/bionic/libc/arch-arm/include" - "-isystem ${T}/bionic/libc/kernel/android/uapi/" "-isystem ${T}/bionic/libc/kernel/uapi/" - "-isystem ${T}/bionic/libc/kernel/uapi/asm-arm/" + "-isystem ${T}/bionic/libc/kernel/android/uapi/" "-isystem ${T}/bionic/libm/include" - "-isystem ${T}/build/core/combo/include/arch/linux-arm/" "-fno-exceptions" "-ffunction-sections" "-fdata-sections" |