Merge "Use FORCE_BUILD_LLVM_COMPONENTS."

This commit is contained in:
Nicolas Geoffray 2020-04-29 09:22:25 +00:00 committed by Gerrit Code Review
commit 71d105ce41
1 changed files with 4 additions and 3 deletions

View File

@ -51,13 +51,11 @@ mkdir -p ${SOONG_OUT}
SOONG_VARS=${SOONG_OUT}/soong.variables SOONG_VARS=${SOONG_OUT}/soong.variables
# We enable bionic linux builds as ART also needs prebuilts for it. # We enable bionic linux builds as ART also needs prebuilts for it.
# Enabling bionic linux requires setting allow_missing_dependencies.
cat > ${SOONG_VARS}.new << EOF cat > ${SOONG_VARS}.new << EOF
{ {
"Platform_sdk_version": ${PLATFORM_SDK_VERSION}, "Platform_sdk_version": ${PLATFORM_SDK_VERSION},
"Platform_sdk_codename": "${PLATFORM_VERSION}", "Platform_sdk_codename": "${PLATFORM_VERSION}",
"Platform_version_active_codenames": ${PLATFORM_VERSION_ALL_CODENAMES}, "Platform_version_active_codenames": ${PLATFORM_VERSION_ALL_CODENAMES},
"Allow_missing_dependencies": true,
"DeviceName": "generic_arm64", "DeviceName": "generic_arm64",
"HostArch": "x86_64", "HostArch": "x86_64",
@ -78,4 +76,7 @@ else
mv ${SOONG_VARS}.new ${SOONG_VARS} mv ${SOONG_VARS}.new ${SOONG_VARS}
fi fi
m --skip-make "$@" # We use force building LLVM components flag (even though we actually don't
# compile them) because we don't have bionic host prebuilts
# for them.
FORCE_BUILD_LLVM_COMPONENTS=true m --skip-make "$@"