aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2019-07-25 16:58:40 -0700
committerEino-Ville Talvala <etalvala@google.com>2019-07-26 12:54:44 -0700
commit976b1e2df9a897029038677fa0c1c6b5616e552e (patch)
tree6f7bad88ebce5873c02802daeecc782816beadfd
parent9008e80c8e817ffbd6bbdc7b195a0b04847badc8 (diff)
downloadbuild-976b1e2df9a897029038677fa0c1c6b5616e552e.tar.gz
Remove libcameraservice and libcamera_client from base_system
Libcameraservice is only used by cameraserver, and is explicitly listed as a dependency. Libcamera_client is used by multiple places, but each of them lists it as a depedency as well, so it's not needed here. Removing the unused 64-bit version of libcameraservice will save ~2 MB on the system partition. Bug: 138403869 Test: atest CtsCameraTestCases Merged-In: I196f869350900e7cc1521bc397c6ecff28decb6f Change-Id: I196f869350900e7cc1521bc397c6ecff28decb6f
-rw-r--r--CleanSpec.mk4
-rw-r--r--target/product/base_system.mk2
2 files changed, 4 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 7c9c6da6f9..386e14c124 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -639,6 +639,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)
+# 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
# ************************************************
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 822d2ead8c..e3e3fbf7e2 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -123,8 +123,6 @@ PRODUCT_PACKAGES += \
libbinder_ndk \
libc.bootstrap \
libcamera2ndk \
- libcamera_client \
- libcameraservice \
libc_malloc_debug \
libc_malloc_hooks \
libcutils \