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
This commit is contained in:
Colin Cross
2018-10-24 16:10:32 -07:00
parent ddfcd42b25
commit 395f2cfa89
4 changed files with 11 additions and 9 deletions

View File

@@ -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