From 3d86a2cf4cb22c8c21b8b541d833ed90e0c8d503 Mon Sep 17 00:00:00 2001 From: Henry Fang Date: Mon, 21 Oct 2019 16:49:10 -0700 Subject: [PATCH] Enable cas@1.2 Turn on cas@1.2 service Test: Manual bug: 141783130 Change-Id: I4966dcc83d8ab31223b634987726a0a3f0e706ce --- CleanSpec.mk | 4 ++++ target/product/base_vendor.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 962709319f..f266ede717 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -704,6 +704,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*) # again, as the original change removing them was reverted. $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar) +# Remove cas@1.1 from the vendor partition +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@1.1*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.cas@1.1*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.cas@1.1*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 1657e71120..7d1babf2e0 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -40,7 +40,7 @@ PRODUCT_HOST_PACKAGES += \ # Base modules and settings for the vendor partition. PRODUCT_PACKAGES += \ - android.hardware.cas@1.1-service \ + android.hardware.cas@1.2-service \ android.hardware.configstore@1.1-service \ android.hardware.media.omx@1.0-service \ boringssl_self_test_vendor \