Pass PREBUILT_SDK_VERSION to soong ndk build

Extract PREBUILT_SDK_VERSION from the make build system and pass
it to soong when doing ndk builds.

Test: untested
Change-Id: I573900dfb83aa8665c2bc349b7823e64497754d3
This commit is contained in:
Colin Cross 2016-11-09 13:00:16 -08:00
parent a5662d5e4e
commit 9fe6ea834f
1 changed files with 5 additions and 1 deletions

View File

@ -7,13 +7,17 @@ fi
TOP=$(pwd) TOP=$(pwd)
source build/envsetup.sh
PLATFORM_SDK_VERSION=$(get_build_var PLATFORM_SDK_VERSION)
SOONG_OUT=${OUT_DIR}/soong SOONG_OUT=${OUT_DIR}/soong
SOONG_NDK_OUT=${OUT_DIR}/soong/ndk SOONG_NDK_OUT=${OUT_DIR}/soong/ndk
rm -rf ${SOONG_OUT} rm -rf ${SOONG_OUT}
mkdir -p ${SOONG_OUT} mkdir -p ${SOONG_OUT}
cat > ${SOONG_OUT}/soong.config << EOF cat > ${SOONG_OUT}/soong.config << EOF
{ {
"Ndk_abis": true "Ndk_abis": true,
"Platform_sdk_version": ${PLATFORM_SDK_VERSION}
} }
EOF EOF
BUILDDIR=${SOONG_OUT} ./bootstrap.bash BUILDDIR=${SOONG_OUT} ./bootstrap.bash