diff options
| author | Shawn Willden <swillden@google.com> | 2018-03-02 16:07:04 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2018-04-03 14:00:19 -0600 |
| commit | 244a701e6c75112858f43ccc97fbf4d002c508f8 (patch) | |
| tree | 7854dad47cc148ccb9eb7f5184271bb7d8fec173 | |
| parent | a59ee40dfdfbae58d3633b85e38975af99d0747e (diff) | |
| download | bonito-244a701e6c75112858f43ccc97fbf4d002c508f8.tar.gz | |
Upgrade B1C1 to Keymaster4
B1C1 already have the Keymaster4 app in the trusted OS. This CL
updates the manifest to use KM4, makes the necessary SEPolicy change
and removes the KM3 RC file.
Test: Boots
Bug: 68727003
Change-Id: Ib08228d944919f0945f17434e86bf15b17e8f638
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | manifest.xml | 10 | ||||
| -rw-r--r-- | sepolicy/vendor/file_contexts | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 25c80737..ea5d3f65 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -75,3 +75,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr) + +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc) + diff --git a/manifest.xml b/manifest.xml index cafb00ce..90d2452c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -161,18 +161,10 @@ <hal format="hidl"> <name>android.hardware.keymaster</name> <transport>hwbinder</transport> - <version>3.0</version> - <interface> - <name>IKeymasterDevice</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.keymaster</name> - <transport>hwbinder</transport> <version>4.0</version> <interface> <name>IKeymasterDevice</name> + <instance>default</instance> <instance>strongbox</instance> </interface> </hal> diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index c388b5b7..a26d7bd3 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -180,7 +180,7 @@ /vendor/bin/hw/android\.hardware\.drm@1\.0-service\.widevine u:object_r:hal_drm_widevine_exec:s0 /vendor/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0 /vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.crosshatch u:object_r:hal_vibrator_default_exec:s0 -/vendor/bin/hw/android\.hardware\.keymaster@3\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0 +/vendor/bin/hw/android\.hardware\.keymaster@4\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service-qti u:object_r:hal_gatekeeper_qti_exec:s0 /vendor/bin/hw/android\.hardware\.gnss@1\.1-service-qti u:object_r:hal_gnss_qti_exec:s0 /vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service-qti u:object_r:hal_bluetooth_default_exec:s0 |