From 8f30661b2d19af67b6c1764dc3527638f887769b Mon Sep 17 00:00:00 2001
From: Spandan Das <spandandas@google.com>
Date: Mon, 8 Apr 2024 17:45:26 +0000
Subject: [PATCH] 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
---
 core/android_soong_config_vars.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index d09bcbc4fe..badcf302e0 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -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.