From 9fe6ea834fbb75418553e6b7c4998802a684e602 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 9 Nov 2016 13:00:16 -0800 Subject: [PATCH] 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 --- scripts/build-ndk-prebuilts.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh index cc418d4b7..65a2329ba 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