tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Drop special-casing of tv in source/prebuilt selection" into main am: 06c6eb7919

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3028706

Change-Id: I0aa84cdc2829f0f739cfccd7586da359e8d2c319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das 2024-04-05 19:54:08 +00:00 committed by Automerger Merge Worker
commit 4b71e6d0fe
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/android_soong_config_vars.mk
View file

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