diff options
| author | Matthew Maurer <mmaurer@google.com> | 2019-05-17 01:10:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-17 01:10:42 -0700 |
| commit | 5faa2bf83baae56ceed9da3a694775e430b99960 (patch) | |
| tree | 9dd0cd1c4e4693bef4ef9a60ab7ec009cf52ec20 | |
| parent | ae862eed2dc3347ce1984e899a187b53ae0f8558 (diff) | |
| parent | ee9e6f128c398bb78aa82c51aa6ea7bf9c1df7d6 (diff) | |
| download | device_generic_trusty-5faa2bf83baae56ceed9da3a694775e430b99960.tar.gz device_generic_trusty-5faa2bf83baae56ceed9da3a694775e430b99960.tar.bz2 device_generic_trusty-5faa2bf83baae56ceed9da3a694775e430b99960.zip | |
Merge "Enable Trusty Keymaster 4.0" am: 69a6b0bb00 am: 0f002df8fe
am: ee9e6f128c
Change-Id: I77c7a54c7a95f48a56460c5cf40beb70a970c2bd
| -rw-r--r-- | manifest.xml | 2 | ||||
| -rw-r--r-- | qemu_trusty_base.mk | 3 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/manifest.xml b/manifest.xml index 26d4b3d..c0893a2 100644 --- a/manifest.xml +++ b/manifest.xml @@ -55,7 +55,7 @@ <hal format="hidl"> <name>android.hardware.keymaster</name> <transport>hwbinder</transport> - <version>3.0</version> + <version>4.0</version> <interface> <name>IKeymasterDevice</name> <instance>default</instance> diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index e4106f4..8b28423 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -21,6 +21,8 @@ PRODUCT_PACKAGES += \ adbd \ android.hidl.allocator@1.0-service \ + system_manifest.xml \ + framework_manifest.xml \ apexd \ com.android.runtime \ dhcpclient \ @@ -75,6 +77,7 @@ PRODUCT_COPY_FILES += \ device/generic/qemu/fstab.ranchu:root/fstab.qemu_trusty \ device/generic/trusty/init.qemu_trusty.rc:root/init.qemu_trusty.rc \ device/generic/trusty/ueventd.qemu_trusty.rc:root/ueventd.qemu_trusty.rc \ + device/generic/goldfish/compatibility_matrix.xml:vendor/compatibility_matrix.xml PRODUCT_COPY_FILES += \ device/generic/goldfish/data/etc/config.ini:config.ini \ diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 94f5594..1c80402 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -5,4 +5,4 @@ /data/vendor/var/run(/.*)? u:object_r:varrun_file:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 /vendor/bin/hw/android.hardware.gatekeeper@1.0-service.trusty u:object_r:hal_gatekeeper_default_exec:s0 -/vendor/bin/hw/android.hardware.keymaster@3.0-service.trusty u:object_r:hal_keymaster_default_exec:s0 +/vendor/bin/hw/android.hardware.keymaster@4.0-service.trusty u:object_r:hal_keymaster_default_exec:s0 |