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

Merge "Drop HOST_CROSS_ARCH special-case in source vs prebuilt mainline selection" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-04-09 23:37:28 +00:00
committed by Gerrit Code Review
parent 85c79a3a3a a43378be19
commit f45c19001f
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 BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
endif 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)) ifneq (,$(MODULE_BUILD_FROM_SOURCE))
# Keep an explicit setting. # 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))) 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)))