commit 7bfb700a7dbe95277f9d74a3990dfeec0bf93f19
author Eino-Ville Talvala <etalvala@google.com> Mon Jul 29 21:12:47 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 29 21:12:47 2019 +0000
tree 3d815d477e17def0b31fea0db6ceefc945fff8c2
parent d71ba658a6c8be39d428dbb79899390c81aff881
parent aa54e5b41e936b124d811230ede0264d97add801

Merge "Remove libcameraservice and libcamera_client from base_system"

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index b899bcd..e913cd0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -648,6 +648,10 @@
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex)
 
+# Remove libcameraservice and libcamera_client from base_system
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 49df60b..5dbc9ec 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -128,8 +128,6 @@
     libbinder_ndk \
     libc.bootstrap \
     libcamera2ndk \
-    libcamera_client \
-    libcameraservice \
     libcutils \
     libdl.bootstrap \
     libdrmframework \