diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-10-08 00:29:34 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-10-08 00:29:34 +0000 |
| commit | 9da0d162848cd278573df918b5899d23c4ee3d6b (patch) | |
| tree | 82c971c57e9f8f9900f45e19ddb7d562be7c884a | |
| parent | 249021681b3aede025558b7d7cee8e3d183daec5 (diff) | |
| parent | db87aa56e7d691a3000b0671fd9ba5ee1e2e1c4a (diff) | |
| download | device_generic_trusty-9da0d162848cd278573df918b5899d23c4ee3d6b.tar.gz device_generic_trusty-9da0d162848cd278573df918b5899d23c4ee3d6b.tar.bz2 device_generic_trusty-9da0d162848cd278573df918b5899d23c4ee3d6b.zip | |
Snap for 5925869 from db87aa56e7d691a3000b0671fd9ba5ee1e2e1c4a to sdk-release
Change-Id: Iff958842b3d9251e2fc3133f3ef5e4c06a43ce6b
| -rw-r--r-- | manifest.xml | 11 | ||||
| -rw-r--r-- | qemu_trusty_base.mk | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/manifest.xml b/manifest.xml index e963553..8c39798 100644 --- a/manifest.xml +++ b/manifest.xml @@ -37,7 +37,7 @@ <hal format="hidl"> <name>android.hardware.configstore</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.1</version> <interface> <name>ISurfaceFlingerConfigs</name> <instance>default</instance> @@ -53,15 +53,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.keymaster</name> - <transport>hwbinder</transport> - <version>4.0</version> - <interface> - <name>IKeymasterDevice</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.graphics.allocator</name> <transport>hwbinder</transport> <version>2.0</version> diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index 8b28423..35c8fdb 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -24,6 +24,8 @@ PRODUCT_PACKAGES += \ system_manifest.xml \ framework_manifest.xml \ apexd \ + com.android.art \ + com.android.i18n \ com.android.runtime \ dhcpclient \ gatekeeperd \ @@ -98,6 +100,7 @@ PRODUCT_PACKAGES += \ PRODUCT_BOOT_JARS := \ core-oj \ core-libart \ + core-icu4j \ conscrypt \ okhttp \ bouncycastle \ |