Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30ae0895 authored by Anton Hansson's avatar Anton Hansson
Browse files

Do not disable prebuilts for sdk builds 

The artifacts in the SDK zip should be OK to build with a prebuilt
stubs enabled, even if prebuilt apexes are not, because the system
images in the SDK stub are not currently used.

Bug: 205008975
Bug: 204407658
Test: m sdk
Change-Id: Ia78cf87743ff394dcfaa1b43556b230c0dda8742
parent ec71cbf0

core/android_soong_config_vars.mk

+6 −1
Original line number Diff line number Diff line
@@ -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,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 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,