Drop special-casing of atv in source/prebuilt selection

All tv devices on internal CI branches currently build in trunk_staging
config. Since trunk_staging provides sources of mainline modules via
RELEASE_APEX_CONTRIBUTIONS_*, we do not need this special-casing
anymore.

(cs query
https://source.corp.google.com/search?q=ATV.*TARGET_RELEASE.*next%20f:%5C.gcl&sq=)

Test: presbumits
Test: used go/abtd to test a handful of targets in tv's release branch
Bug: 308188056
Change-Id: Iaadd5b9151c8cce3fe0a193f2e5c37d63e6095d4
This commit is contained in:
Spandan Das
2024-04-04 23:36:44 +00:00
parent 83066f6dc0
commit f01a7d82ee

View File

@@ -81,12 +81,6 @@ ifneq (,$(filter tv,$(subst $(comma),$(space),${PRODUCT_CHARACTERISTICS})))
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
endif
# ATV based devices do not seem to work with prebuilts, so build from source
# for now and fix in a follow up.
ifneq (,${PRODUCT_IS_ATV})
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
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)))