diff options
| author | Colin Cross <ccross@android.com> | 2018-10-24 16:10:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-10-24 23:20:10 +0000 |
| commit | 395f2cfa8940fccd426d9bc830e4300e0076f407 (patch) | |
| tree | 2bd32e8115a1e0fa65107aee514847b1dc905557 /scripts | |
| parent | ddfcd42b2527ec7e66dd310ee074d0343d8a06ee (diff) | |
| download | build_soong-395f2cfa8940fccd426d9bc830e4300e0076f407.tar.gz build_soong-395f2cfa8940fccd426d9bc830e4300e0076f407.tar.bz2 build_soong-395f2cfa8940fccd426d9bc830e4300e0076f407.zip | |
Move Ndk_abis from soong.config to soong.variables
soong.config is not cleared between builds, which can cause
problems when switching between an ndk build and a platform build.
Bug: 118398924
Test: OUT_DIR=out_ndk DIST_DIR=dist build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: Ifc03a0c25f46625375cdda5723e4a09d7d8050d5
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-ndk-prebuilts.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh index 7f6e2c9d..0143d1e8 100755 --- a/scripts/build-ndk-prebuilts.sh +++ b/scripts/build-ndk-prebuilts.sh @@ -34,11 +34,6 @@ SOONG_OUT=${OUT_DIR}/soong SOONG_NDK_OUT=${OUT_DIR}/soong/ndk rm -rf ${SOONG_OUT} mkdir -p ${SOONG_OUT} -cat > ${SOONG_OUT}/soong.config << EOF -{ - "Ndk_abis": true -} -EOF # We only really need to set some of these variables, but soong won't merge this # with the defaults, so we need to write out all the defaults with our values @@ -63,7 +58,9 @@ cat > ${SOONG_OUT}/soong.variables << EOF ], "HostArch": "x86_64", "Malloc_not_svelte": false, - "Safestack": false + "Safestack": false, + + "Ndk_abis": true } EOF m --skip-make ${SOONG_OUT}/ndk.timestamp |