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

Commit 41d2a552 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Drop PRODUCT_PACKAGES special-case in source vs prebuilt mainline... 

Merge "Drop PRODUCT_PACKAGES special-case in source vs prebuilt mainline selection" into main am: 13045cd3

Original change: https://android-review.googlesource.com/c/platform/build/+/3037776



Change-Id: I1200e2d62cfb7653c44ea82f8596d6b27ab54878
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b59fa6c2 13045cd3

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.