StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop HOST_CROSS_ARCH special-case in source vs prebuilt mainline selection

Browse Source 
`PRODUCT_MODULE_BUILD_FROM_SOURCE` has been added explicitly to the
products that have `HOST_CROSS_ARCH=arm64`, so we do not need this
special case here anymore.

Bug: 308188056
Test: presubmits
Change-Id: Ide3dbf9c3674683f2e0546403622cf6b8fe78739
This commit is contained in:
Spandan Das
2024-04-08 17:45:26 +00:00
parent f52543b2e1
commit a43378be19
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/android_soong_config_vars.mk
View File

@@ -44,12 +44,6 @@ ifeq (,$(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE))
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
endif
# ART does not provide host side arm64 variants needed for products that
# set HOST_CROSS_ARCH=arm64.
ifeq (arm64,${HOST_CROSS_ARCH})
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
endif
ifneq (,$(MODULE_BUILD_FROM_SOURCE))
# Keep an explicit setting.
else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))