commit 6936e12b10365f101c283f4b4553c3b0271d7d39
author Patrik Fimml <patrikf@google.com> Wed Nov 21 15:39:13 2018 +0100
committer Patrik Fimml <patrikf@google.com> Tue Nov 27 11:02:07 2018 +0000
tree 90cfe885f9bae41e4052270cf938450df83d0a5c
parent 02d57864c3db7462931eb8e527b3e15f200ae3b9

Push cameraserver downstream from base_system.mk.

Some non-phone form factors don't want cameraserver to save storage and RAM.
Pushing it down to handheld and other build files allows selective inclusion to
happen there.

Intended to be a no-op refactoring, will disable for ATV in a follow-up CL.

Bug: 118369095
Test: built system image for random device as smoke test
Change-Id: I260fa5c9e512341d6a6824afebd5e8273fa5e66c

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 07fbc3d..8e24aeb 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 \