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

Merge "Do not disable prebuilts for sdk builds" am: db7732900b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1881856

Change-Id: If8ccccc8043c1295d7ac632a53a2e5bfdda90fb6
This commit is contained in:
Anton Hansson
2021-11-08 10:45:34 +00:00
committed by Automerger Merge Worker
parent 8df9e5c1c2 db7732900b
commit e637223368
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/android_soong_config_vars.mk
View File

@@ -32,7 +32,12 @@ $(call add_soong_config_var,ANDROID,BOARD_USES_RECOVERY_AS_BOOT)
$(call add_soong_config_var,ANDROID,BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(call add_soong_config_var,ANDROID,BOARD_BUILD_SYSTEM_ROOT_IMAGE)
$(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)
ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))) ifneq (,$(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)))
# The artifacts in the SDK zip are OK to build with prebuilt stubs enabled,
# even if prebuilt apexes are not enabled, because the system images in the
# SDK stub are not currently used (and will be removed: b/205008975).
MODULE_BUILD_FROM_SOURCE ?= false
else ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES)))
# Prebuilt module SDKs require prebuilt modules to work, and currently # Prebuilt module SDKs require prebuilt modules to work, and currently
# prebuilt modules are only provided for com.google.android.xxx. If we can't # prebuilt modules are only provided for com.google.android.xxx. If we can't
# find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use, # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,