| commit | 4bc5c8fed5e4297e27bd3cb8e39b13750db0bdc0 | [log] [tgz] |
|---|---|---|
| author | Patrik Fimml <patrikf@google.com> | Fri Dec 21 13:05:38 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 21 13:05:38 2018 +0000 |
| tree | 50e7ab99cde5b2cc4b71019023b007942a646651 | |
| parent | 03ad10369548cbf8031d4561c1fee1bea95a039e [diff] | |
| parent | 618f1b2c0c902b3e1af4d3e0ac51a91a40b983e4 [diff] |
Merge "Push cameraserver downstream from base_system.mk."
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 29e12e4..b5804b1 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.conscrypt \
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 \