Remove cameraserver from car products
Because Extended View System provides the surface to use camera streams
in Android car products, this change removes cameraserver from car
product build script and configure EVS manager to override cameraserver.
Also, this change sets config.disable_cameraservice as true for the car
products, to configure Camera API not to connect to cameraserver.
Bug: 170790154
Test: Build image, `grep cameraserver
$ANDROID_PRODUCT_OUT/installed-files.txt` does not show
cameraserver and cameraserver.rc
Change-Id: If67b5acf416142787f1701ba1693927ce2c11296
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index b230bab..0b6a790 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -52,7 +52,6 @@
MmsService \
ExternalStorageProvider \
atrace \
- cameraserver \
libandroidfw \
libaudioutils \
libmdnssd \
@@ -68,6 +67,10 @@
# 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
diff --git a/cpp/evs/manager/1.1/Android.bp b/cpp/evs/manager/1.1/Android.bp
index 6c3d7af..2fb9e63 100644
--- a/cpp/evs/manager/1.1/Android.bp
+++ b/cpp/evs/manager/1.1/Android.bp
@@ -101,6 +101,8 @@
cc_binary {
name: "android.automotive.evs.manager@1.1",
+ overrides: ["cameraserver"],
+
defaults: ["android.automotive.evs.manager_defaults"],
srcs: [