Pass Platform_version_all_codenames to NDK build.

We're still only generating the released versions and "current" when
we build with build-ndk-prebuilts.sh. Pass
Platform_version_all_codenames from make to generate the in-progress
platform versions as well.

Also move this over to soong.variables, since that's the appropriate
place for them. The Platform_sdk_version we were passing wasn't
actually being used before.

Test: OUT_DIR=ndk-out DIST_DIR=ndk-dist \
          build/soong/scripts/build-ndk-prebuilts.sh
Bug: None

Change-Id: Iccb709f5c12309754073ac8f0d4bc365019dfcd3
This commit is contained in:
Dan Albert
2017-07-31 14:23:39 -07:00
parent 31384debd7
commit 59034511c5

View File

@@ -9,6 +9,12 @@ TOP=$(pwd)
source build/envsetup.sh
PLATFORM_SDK_VERSION=$(get_build_var PLATFORM_SDK_VERSION)
PLATFORM_VERSION_ALL_CODENAMES=$(get_build_var PLATFORM_VERSION_ALL_CODENAMES)
# PLATFORM_VERSION_ALL_CODESNAMES is a comma separated list like O,P. We need to
# turn this into ["O","P"].
PLATFORM_VERSION_ALL_CODENAMES=${PLATFORM_VERSION_ALL_CODENAMES/,/","}
PLATFORM_VERSION_ALL_CODENAMES="[\"${PLATFORM_VERSION_ALL_CODENAMES}\"]"
SOONG_OUT=${OUT_DIR}/soong
SOONG_NDK_OUT=${OUT_DIR}/soong/ndk
@@ -16,8 +22,36 @@ rm -rf ${SOONG_OUT}
mkdir -p ${SOONG_OUT}
cat > ${SOONG_OUT}/soong.config << EOF
{
"Ndk_abis": true,
"Platform_sdk_version": ${PLATFORM_SDK_VERSION}
"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
# added.
cat > ${SOONG_OUT}/soong.variables << EOF
{
"Platform_sdk_version": ${PLATFORM_SDK_VERSION},
"Platform_version_active_codenames": ${PLATFORM_VERSION_ALL_CODENAMES},
"DeviceName": "flounder",
"DeviceArch": "arm64",
"DeviceArchVariant": "armv8-a",
"DeviceCpuVariant": "denver64",
"DeviceAbi": [
"arm64-v8a"
],
"DeviceUsesClang": true,
"DeviceSecondaryArch": "arm",
"DeviceSecondaryArchVariant": "armv7-a-neon",
"DeviceSecondaryCpuVariant": "denver",
"DeviceSecondaryAbi": [
"armeabi-v7a"
],
"HostArch": "x86_64",
"HostSecondaryArch": "x86",
"Malloc_not_svelte": false,
"Safestack": false
}
EOF
BUILDDIR=${SOONG_OUT} ./bootstrap.bash