Merge "Added automotive-sdv-tests" into main
diff --git a/core/OWNERS b/core/OWNERS
index 1c3d017..95c7c9c 100644
--- a/core/OWNERS
+++ b/core/OWNERS
@@ -13,3 +13,6 @@
# For binary_translation
per-file berberis_test.mk = levarum@google.com,khim@google.com,dimitry@google.com
+
+# For automotive sdv test suites
+per-file tasks/automotive-sdv-tests.mk = amanajas@google.com,schinchalkar@google.com,smara@google.com,madlmayr@google.com,mariiasvit@google.com
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 4978a6a..4e42a21 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -75,12 +75,6 @@
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
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))
# 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)))