Allow the products to enable Android camera service
This CL introduces ENABLE_CAMERA_SERVICE build variable and the Android
automotive products are required to set this as true if they want to
have Android camera service.
Bug: 170790154
Bug: 187481454
Test: Runs tests described at go/aaos-camera2-api-support
Change-Id: I91b1c94639055fc21b8d23da0cb8b52bf3b026bd
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index 441fa0c..ecd503b 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -62,13 +62,15 @@
PackageInstaller \
carbugreportd \
+# ENABLE_CAMERA_SERVICE must be set as true from the product's makefile if it wants to support
+# Android Camera service.
+ifneq ($(ENABLE_CAMERA_SERVICE), true)
+PRODUCT_PROPERTY_OVERRIDES += config.disable_cameraservice=true
+endif
+
# EVS service
include packages/services/Car/cpp/evs/manager/evsmanager.mk
-# EVS manager overrides cameraserver on automotive implementations so
-# we need to configure Camera API to not connect to it
-PRODUCT_PROPERTY_OVERRIDES += config.disable_cameraservice=true
-
ifeq ($(ENABLE_EVS_SAMPLE), true)
# ENABLE_EVS_SAMPLE should set be true or their vendor specific equivalents should be included in
# the device.mk with the corresponding selinux policies