Merge "Push cameraserver downstream from base_system.mk."

2018-12-21 13:05:38 +00:00 · 2018-12-21 13:05:38 +00:00 · 4bc5c8fed5
commit 4bc5c8fed5
parent 03ad103695 618f1b2c0c
2 changed files with 1 additions and 1 deletions
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@ -48,7 +48,6 @@ PRODUCT_PACKAGES += \
    bu \
    bugreport \
    bugreportz \
-    cameraserver \
    charger \
    cmd \
    com.android.conscrypt \
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@ -41,6 +41,7 @@ PRODUCT_PACKAGES += \
    Calendar \
    CalendarProvider \
    Camera2 \
+    cameraserver \
    CaptivePortalLogin \
    CertInstaller \
    clatd \