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

Commit 13045cd3 authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

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

parents d22eee50 8f30661b
Loading
Loading
Loading
Loading
+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.