aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-11-09 13:00:16 -0800
committerColin Cross <ccross@android.com>2016-11-09 13:01:41 -0800
commit9fe6ea834fbb75418553e6b7c4998802a684e602 (patch)
tree0c6b3f26954b84c3ee9ad9a47472175d65fd6c4b /scripts
parenta5662d5e4ef7bc2cc63a5c3c123e29c93956686c (diff)
downloadbuild_soong-9fe6ea834fbb75418553e6b7c4998802a684e602.tar.gz
build_soong-9fe6ea834fbb75418553e6b7c4998802a684e602.tar.bz2
build_soong-9fe6ea834fbb75418553e6b7c4998802a684e602.zip
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-ndk-prebuilts.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh
index cc418d4b..65a2329b 100755
--- a/scripts/build-ndk-prebuilts.sh
+++ b/scripts/build-ndk-prebuilts.sh
@@ -7,13 +7,17 @@ fi
TOP=$(pwd)
+source build/envsetup.sh
+PLATFORM_SDK_VERSION=$(get_build_var PLATFORM_SDK_VERSION)
+
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
+ "Ndk_abis": true,
+ "Platform_sdk_version": ${PLATFORM_SDK_VERSION}
}
EOF
BUILDDIR=${SOONG_OUT} ./bootstrap.bash