summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-02Fix Trusty log file permissions and ownershipandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Marco Nelissen
Bug: 190050919 Test: build, boot Change-Id: If899f52095ab79b2515fa8befca2c314428fffec
2022-01-20Merge "Allow TEE storageproxyd permissions needed for DSU handling"Treehugger Robot
2021-12-14Allow TEE storageproxyd permissions needed for DSU handlingStephen Crane
Allows the vendor TEE access to GSI metadata files (which are publicly readable). Storageproxyd needs access to this metadata to determine if a GSI image is currently booted. Also allows the TEE domain to make new directories in its data path. Test: access /metadata/gsi/dsu/booted from storageproxyd Bug: 203719297 Change-Id: I696ef8912de396531987e1104fb2b7ceebfbe44c
2021-10-30Remove reference to mdnsd. am: 646d43c9f6 am: 12c8c2950c am: a0654f4a44Elliott Hughes
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1876478 Change-Id: I8c3e2d5826a0e0cfa353560b6e1398e8a205ce90
2021-10-30Remove reference to mdnsd. am: 646d43c9f6 am: 12c8c2950cElliott Hughes
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1876478 Change-Id: I893603a47340e56faddef7c8064b8417b005754e
2021-10-30Remove reference to mdnsd. am: 646d43c9f6Elliott Hughes
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1876478 Change-Id: Ia14a268ac217c0cc7f2cc8c0e41b6756b6ffc6d2
2021-10-29Remove reference to mdnsd.Elliott Hughes
Change-Id: Ibd10f30829765945181edb15e8484d7178cc2405
2021-09-14Add Keymint tests am: 4a7b938ab5 am: 08ca3e2d15 am: 052334a3efTri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1822570 Change-Id: I1ae7ad1d0333c33acf74d325aacec59104638bbd
2021-09-13Add Keymint tests am: 4a7b938ab5 am: 08ca3e2d15Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1822570 Change-Id: Ia4906f699f4c789ce685b738156684ea3bf99ff6
2021-09-13Add Keymint tests am: 4a7b938ab5android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1822570 Change-Id: Ia40a921ee54e0c07e8822ff5651bc6449d8cf1fa
2021-09-13Sepolicy label for Keymint HAL am: 9642dc8664 am: 0c6f7ff712 am: 68644ea8daTri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1822569 Change-Id: I18b5a8fd60b7cae3ad28a8ff9f2f5b999262ff39
2021-09-13Sepolicy label for Keymint HAL am: 9642dc8664 am: 0c6f7ff712Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1822569 Change-Id: Idfe2c65d46f4b383d0800511df485bb5e9f0d899
2021-09-13Sepolicy label for Keymint HAL am: 9642dc8664Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1822569 Change-Id: I9fd9c681fc988fdd0c95e4387382894cd21dff3d
2021-09-09Add Keymint testsTri Vo
Bug: 199435757 Test: boot Trusty emulator Change-Id: I95a3e4bd284eb8a8afded61b7c3c0d45259e5bd5
2021-09-09Sepolicy label for Keymint HALTri Vo
Bug: 199435757 Test: boot Trusty emulator Change-Id: I1cef3f0aff3834d27cc32e873da07428dc2433bd
2021-08-03Add vdc to qemu trusty build am: 76f4cae668 am: ee38aa9ff5Keith Mok
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1784040 Change-Id: Iee42037bac69fe393588732cbf0f84cc57b2a7f8
2021-08-03Add vdc to qemu trusty build am: 76f4cae668Keith Mok
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1784040 Change-Id: Ia265c2cbe7bfdec2074fa5468195ec7b928b79d6
2021-08-03Add vdc to qemu trusty buildandroid-s-beta-5android-s-beta-5Keith Mok
earlyboot is called by vdc from vold And vdc package is missing from the build. Add vdc for testing earlyboot Test: manual Change-Id: Ida752daa1527791e0592e540bd475437a090eebf
2021-07-13Fix securedpud sepolicy denials am: a349a5eade am: fbaa488933Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1764014 Change-Id: I8e34f5dd884cfe2a7f722b5d8dc31e7038b57440
2021-07-13Fix securedpud sepolicy denials am: a349a5eadeTri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1764014 Change-Id: I0599134e4b9d84e98d01857e1fac4a39f7da8ebb
2021-07-12Fix securedpud sepolicy denialsandroid-s-beta-4android-s-beta-3android-s-beta-4Tri Vo
Address following denials: avc: denied { read } for comm="securedpud" name="system" dev="tmpfs" ino=321 scontext=u:r:securedpud:s0 tcontext=u:object_r:dmabuf_system_heap_device:s0 tclass=chr_file permissive=1 avc: denied { open } for comm="securedpud" path="/dev/dma_heap/system" dev="tmpfs" ino=321 scontext=u:r:securedpud:s0 tcontext=u:object_r:dmabuf_system_heap_device:s0 tclass=chr_file permissive=1 avc: denied { ioctl } for comm="securedpud" path="/dev/dma_heap/system" dev="tmpfs" ino=321 ioctlcmd=0x4800 scontext=u:r:securedpud:s0 tcontext=u:object_r:dmabuf_system_heap_device:s0 tclass=chr_file permissive=1 Bug: 176508588 Test: m selinux_policy Change-Id: Ibb1f07c6341920c061323105ea2486b516a18915
2021-06-16Increase size of userdata partition am: 224ba2ac66 am: 314e117b0aStephen Crane
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1738574 Change-Id: I77249201fa20a7a1442308b5ede655f621469d90
2021-06-16Increase size of userdata partition am: 224ba2ac66Stephen Crane
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1738574 Change-Id: I9149d2100d38442a8b406d95d604514281c208da
2021-06-16Increase size of userdata partitionStephen Crane
The libraries needed for Trusty fuzzers can exceed 64M. Bump the userdata partition up to 128M so there is sufficient space. Bug: 191281949 Test: make Change-Id: I4bf87a6f729d1b75aff33518e88644430e7243c2
2021-05-21Make qemu_trusty_base inherit from default_art_config.mk am: 70c9adc65e am: ↵Tri Vo
8508008760 Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1714954 Change-Id: I0bc04ff2eb014c69feea761914bb080c6cc71352
2021-05-21Make qemu_trusty_base inherit from default_art_config.mk am: 70c9adc65eTri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1714954 Change-Id: I5764eb0d76f537bc6719d29c3fb7a4e35483faf1
2021-05-21Make qemu_trusty_base inherit from default_art_config.mkTri Vo
Current configuration is slightly inconsistent with standard configuration. Inheriting from default_art_config.mk resolves the problem and makes things easier to maintain. Also, this fixes our build. Bug: 188680624 Test: m Change-Id: I786e21e6a4dcd46286d1944c2bac0e0a84f35373
2021-05-21Fix qemu_trusty_arm64 build am: 790d5e9fc7 am: 7db3d5187aTri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1714950 Change-Id: I168ed27b9b2fe744c2e7717a762b3d4ae5dce729
2021-05-21Fix qemu_trusty_arm64 build am: 790d5e9fc7Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1714950 Change-Id: I2985f23c3a98d26807dbb4952a3707eedae8caac
2021-05-20Fix qemu_trusty_arm64 buildTri Vo
Bug: 188680624 Test: m Change-Id: Ibc2b71ba0475bf0fc953c3428526fd940607d5ac
2021-05-20Add odsign to qemu_trusty_arm64 am: 4a9e3956c0 am: 27e0a97fd9Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1714030 Change-Id: I6d3bb2090f092df602dc4cc6410a1432adbbd6f1
2021-05-20Add odsign to qemu_trusty_arm64 am: 4a9e3956c0Tri Vo
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1714030 Change-Id: I693bc372be57c5de82f48f1cf0d5efd024cdf991
2021-05-20Add odsign to qemu_trusty_arm64Tri Vo
Init waits on odsign during boot, i.e. it'll be stuck without it. Bug: 188680624 Test: boot Trusty emulator Change-Id: I0445c10e69af8511403520b239e978f1a93fd396
2021-05-11Merge "Add libtrusty_metrics_test to qemu_trusty_arm64" am: d54cb0d2ea am: ↵Treehugger Robot
96b39d96ee am: ecccf1cb0f am: 3c9b470773 Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1697306 Change-Id: I09f35543fab61a76e9cdff3c6a6dae4da1740dfd
2021-05-11Merge "Add libtrusty_metrics_test to qemu_trusty_arm64" am: d54cb0d2ea am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devTreehugger Robot
96b39d96ee am: ecccf1cb0f Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1697306 Change-Id: Iabfca065680ff18f1540415299a311576e478d6c
2021-05-11Merge "Add libtrusty_metrics_test to qemu_trusty_arm64" am: d54cb0d2ea am: ↵Treehugger Robot
96b39d96ee Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1697306 Change-Id: I2b9ada9ff21a0cb02ac22088d550718d43bc0ac2
2021-05-11Merge "Add libtrusty_metrics_test to qemu_trusty_arm64" am: d54cb0d2eaTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1697306 Change-Id: I96cb9c2592f7cac064127da00ea732a0839b036f
2021-05-11Merge "Add libtrusty_metrics_test to qemu_trusty_arm64"android-s-beta-2android-s-beta-1Treehugger Robot
2021-05-05Add libtrusty_metrics_test to qemu_trusty_arm64Tri Vo
Bug: 182489121 Test: m Change-Id: I75f7a83940124cd3beb44bb03e83c791360a3354
2021-04-10Remove android.test.base from PRODUCT_BOOT_JARS am: b5af8d6ae8 am: ↵Paul Duffin
0b699d91af am: 9b7ff7fe5a Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1672026 Change-Id: If69e02abdd80a01fd34b1b28dce6d0e85200bab3
2021-04-10Remove android.test.base from PRODUCT_BOOT_JARS am: b5af8d6ae8 am: 0b699d91afPaul Duffin
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1672026 Change-Id: I6a2c74fc3eb86b92dcd186ba3a94082223bc7bff
2021-04-10Remove android.test.base from PRODUCT_BOOT_JARS am: b5af8d6ae8Paul Duffin
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1672026 Change-Id: I9a136047846bab694f934e70a9ac6d239fb8225a
2021-04-09Remove android.test.base from PRODUCT_BOOT_JARSPaul Duffin
The qemu_trusty_base.mk duplicates some of the definitions in build/make/target/product/default_art_config.mk. Except it did not duplicate the conditional logic surrounding the addition of the android.test.base to PRODUCT_BOOT_JARS which by default does not add android.test.base. That means that if that file was used to configure a build that the resulting system image would have included android.test.base and so differed from the normal system image. The conditional logic has since been removed under bug 184331423 as it was no longer required. This change removes android.test.base from PRODUCT_BOOT_JARS in qemu_trust_base.mk to make it consistent. Bug: 184331423 Test: m droid Change-Id: I474a5b40c85c33bcbcc27be3331f5b7fe4b98fe1
2021-03-24[automerger skipped] Add legacy-align parameter to DmabufHeapAlloc() am: ↵Hridya Valsaraju
3bf140a6fa am: 7555b3dc71 am: 3bfdb56994 -s ours am skip reason: skip tag Change-Id I5682034f029c5addafebfe18307c03b4e750f1fa with SHA-1 4499c38f3f is already in history Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1651691 Change-Id: I83e3a876f5b9c3a36351ad6dee75fc9ebd8f7719
2021-03-24Add legacy-align parameter to DmabufHeapAlloc() am: 3bf140a6fa am: 7555b3dc71Hridya Valsaraju
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1651691 Change-Id: I225e061eb545c4f9a6abec62dda2319f1e938643
2021-03-24Add legacy-align parameter to DmabufHeapAlloc() am: 3bf140a6faHridya Valsaraju
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1651691 Change-Id: I9b2d9da0748320899948cfc9d6209d33655dd036
2021-03-23Add legacy-align parameter to DmabufHeapAlloc()Hridya Valsaraju
The parameter is intended to make the API backwards compatible with legacy ION devices. The parameter will be ignored for devices that support DMA-BUF heaps. Test: build Bug: 176508588 Change-Id: I5682034f029c5addafebfe18307c03b4e750f1fa Merged-In: I5682034f029c5addafebfe18307c03b4e750f1fa
2021-03-23Add legacy-align parameter to DmabufHeapAlloc()Hridya Valsaraju
The parameter is intended to make the API backwards compatible with legacy ION devices. The parameter will be ignored for devices that support DMA-BUF heaps. Test: build Bug: 176508588 Change-Id: I5682034f029c5addafebfe18307c03b4e750f1fa Merged-In: I5682034f029c5addafebfe18307c03b4e750f1fa
2021-03-15Add wrapped attestation keys for the emulator am: 43cdcf56d5 am: 0f846d65c7 ↵Matthew Maurer
am: db632f492b Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1633902 Change-Id: I23a911738329291e9b8bd486e72738b1e777e1f5
2021-03-15Add wrapped attestation keys for the emulator am: 43cdcf56d5 am: 0f846d65c7Matthew Maurer
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1633902 Change-Id: Ia04fbee72bb48c83733d32c0d9c9cf5503c9883b