commit 9f0e7c70de2d394f2415ae87954f419ea3260838
author Patrik Fimml <patrikf@google.com> Thu Dec 06 17:53:27 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 06 17:53:27 2018 +0000
tree 745c65cfac63871d4bcd0b2f9ab2cc8c54f56045
parent 0451e75be4a011e0572261c174bfaa7218617967
parent 6936e12b10365f101c283f4b4553c3b0271d7d39

Merge "Push cameraserver downstream from base_system.mk." into pi-dev-plus-aosp

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 2c53a6e..5a2be27 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -48,7 +48,6 @@
     bu \
     bugreport \
     bugreportz \
-    cameraserver \
     charger \
     cmd \
     com.android.location.provider \

target/product/handheld_system.mk

diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index a961d1e..f874868 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -41,6 +41,7 @@
     Calendar \
     CalendarProvider \
     Camera2 \
+    cameraserver \
     CaptivePortalLogin \
     CertInstaller \
     clatd \