diff options
| -rwxr-xr-x | scripts/build-ndk-prebuilts.sh | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh index 65a2329ba..2a1c7df55 100755 --- a/scripts/build-ndk-prebuilts.sh +++ b/scripts/build-ndk-prebuilts.sh @@ -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 |