diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-31 03:18:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-31 03:18:51 +0000 |
| commit | adb980c95a5e72103e647d963ae209631297566b (patch) | |
| tree | 4f591ab1edcc18176fc04dccb1e43e55bfc091a4 | |
| parent | 4178712bd5c5ba7d32911b546a6be0ad573d9c29 (diff) | |
| parent | 6f6d78bace5c886a75526a244b1d31f9999a052b (diff) | |
| download | build-adb980c95a5e72103e647d963ae209631297566b.tar.gz | |
Make change and version bump to QD1A.190731.001
Change-Id: I0554ab812ed22d1adb7448bc9b28ac4613dba7e0
| -rw-r--r-- | CleanSpec.mk | 4 | ||||
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | target/product/base_system.mk | 2 |
4 files changed, 6 insertions, 4 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/core/Makefile b/core/Makefile index befb50fab0..4253b7200e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3655,7 +3655,7 @@ OTATOOLS_DEPS := \ ifneq (,$(wildcard device)) OTATOOLS_DEPS += \ $(sort $(shell find device $(wildcard vendor) -type f -name "*.pk8" -o -name "verifiedboot*" -o \ - -name "*.x509.pem" -o -name "oem*.prop")) + -name "*.pem" -o -name "oem*.prop" -o -name "*.avbpubkey")) endif ifneq (,$(wildcard external/avb)) OTATOOLS_DEPS += \ diff --git a/core/build_id.mk b/core/build_id.mk index 1a7400c311..d652466ec9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QD1A.190730.001 +BUILD_ID=QD1A.190731.001 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 \ |