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

Commit 8f30661b authored by Spandan Das's avatar Spandan Das
Browse files

Drop PRODUCT_PACKAGES special-case in source vs prebuilt mainline selection 

google products that include mainline apexes use
RELEASE_APEX_CONTRIBUTIONS_* for source vs prebuilt selection.
RELEASE_APEX_CONTRIBUTIONS is aware of aosp products via a parallel
special-case in core/product_config.mk, so we do not need this duplicate
special case here.

Bug: 308188056
Test: presubmits
Change-Id: I2fc904d3f661c105ec9a48a313723bc881a623f8
parent ba670284

core/android_soong_config_vars.mk

+1 −8
Original line number Diff line number Diff line
@@ -46,14 +46,7 @@ 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)))

  # Prebuilt module SDKs require prebuilt modules to work, and currently

  # prebuilt modules are only provided for com.google.android(.go)?.xxx. If we can't

  # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,

  # and disable prebuilt SDKs. In particular this applies to AOSP builds.

  #

  # However, docs/sdk/win_sdk/sdk_addon builds might not include com.google.android.xxx

  # packages, so for those we respect the default behavior.

else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS)))

  MODULE_BUILD_FROM_SOURCE := true

else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))

  # Let products override the branch default.