summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Remove conflicting Gatekeeper declarationMatthew Maurer2019-06-271-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now provided by the VINTF in the rest of the gatekeeper changes. Change-Id: Icd55270b6a31153f90f24c7ea258630d01618e10 Merged-In: Icd55270b6a31153f90f24c7ea258630d01618e10
* | | | | | Clean up hard-coded sepolicy version in VINTF manifest. am: cb154aa91a am: ↵Yifan Hong2019-06-271-3/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58d060a077 am: 98fa3147a5 Change-Id: I6e2cbd8c63cd5ffebb3257a9fc3e7c429194c54d
| * | | | | Clean up hard-coded sepolicy version in VINTF manifest. am: cb154aa91aYifan Hong2019-06-271-3/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | am: 58d060a077 Change-Id: I764018dad8da43a776b25d91281fd0093b1a5bca
| | * | | Clean up hard-coded sepolicy version in VINTF manifest.Yifan Hong2019-06-271-3/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: cb154aa91a Change-Id: I33f768be9deadea2c2a4b18eb56f848ed5bca401
| | | * | Clean up hard-coded sepolicy version in VINTF manifest.Yifan Hong2019-06-261-3/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | Test: m device_manifest.xml, no warning Bug: 136042734 Change-Id: I22d80d2eca818021582914f07a17adb5e42687eb
* | | | Remove conflicting Gatekeeper declarationMatthew Maurer2019-06-251-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now provided by the VINTF in the rest of the gatekeeper changes. Change-Id: Icd55270b6a31153f90f24c7ea258630d01618e10 Merged-In: Icd55270b6a31153f90f24c7ea258630d01618e10
* | | | Increase system image size am: 460b82228f am: 5c933341e6Matthew Maurer2019-05-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 2f218064c2 Change-Id: I1740e5ac381ef8adfe393a977a8cbd5a1e51d9ad
| * | | Increase system image size am: 460b82228fMatthew Maurer2019-05-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: 5c933341e6 Change-Id: I3c6d8ef0ba7a4a918bd4bb201999e2f96665a45a
| | * | Increase system image sizeMatthew Maurer2019-05-211-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | am: 460b82228f Change-Id: I464f98f775856d06a4f99c603358fc2a084cb7b6
| | | * Increase system image sizeMatthew Maurer2019-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More things got put into the default runtime apex, we need a bigger system partition. Bug: 133173474 Test: lunch qemu_trusty_arm64-userdebug; make; run trusty test suite
* | | | Enable goldfish customizations am: cdb995dafc am: 41090ebda9Matthew Maurer2019-05-211-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | am: a74173f554 Change-Id: I47ae58ea16f6da6fd416db4c6bcb8bb1380c710f
| * | | Enable goldfish customizations am: cdb995dafcMatthew Maurer2019-05-211-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | am: 41090ebda9 Change-Id: Idb6adb3b6a3ad759e36fdfed982269bc11ded630
| | * | Enable goldfish customizationsMatthew Maurer2019-05-211-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | am: cdb995dafc Change-Id: I7ba9a3b3241a903bd38f6bc43d9784eded3a2b45
| | | * Enable goldfish customizationsMatthew Maurer2019-05-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously got these from BUILD_QEMU_IMAGES. We can't use that flag anymore because we aren't using dynamic partitions. Setting QEMU_CUSTOMIZATIONS will bring in the changes without building the qemu images. Bug: 133173474 Test: lunch qemu_trusty_arm64-userdebug; make; run trusty test suite
* | | | Merge "Enable Trusty Keymaster 4.0" am: 69a6b0bb00 am: 0f002df8feMatthew Maurer2019-05-173-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | am: ee9e6f128c Change-Id: I77c7a54c7a95f48a56460c5cf40beb70a970c2bd
| * | | Merge "Enable Trusty Keymaster 4.0" am: 69a6b0bb00Matthew Maurer2019-05-163-2/+5
|/| | | | |/ / | | | | | | | | | | | | am: 0f002df8fe Change-Id: Idf7ac4ed83c64aa46e15bd472224d8df5345d0df
| * | Merge "Enable Trusty Keymaster 4.0"Matthew Maurer2019-05-163-2/+5
| |\| | | | | | | | | | | | | | | | am: 69a6b0bb00 Change-Id: I62d9985797c418709ae6a0d1721788d319768745
| | * Merge "Enable Trusty Keymaster 4.0"Matthew Maurer2019-05-173-2/+5
| |/|
| | * Enable Trusty Keymaster 4.0Matthew Maurer2019-05-163-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switch our manifest to use KM4 instead of KM3. * Include framework_manifest.xml, needed by Keymaster 4 VTS to find the service manager. * Label Trusty KM4 as a keymaster daemon Bug: 128851722 Test: Keymaster VTS 4.0 + Trusty Change-Id: I268fe08e3af3f1311b163f9f2ebb42796ed0a5b9
* | | qemu-trusty: dont build system-qemu.img am: 32e26a4a4cbohu2019-05-061-1/+0
|\| | | | | | | | | | | | | | | | | am: cc1607df5c Change-Id: I7dbf780f55f9e23423e387a4cbfb3e1100102496
| * | qemu-trusty: dont build system-qemu.imgbohu2019-05-061-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 32e26a4a4c Change-Id: I32a82e48a9c4743eca16a416bdf6190894341113
| | * | qemu-trusty: dont build system-qemu.imgbohu2019-05-061-1/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not needed. Test: lunch qemu_trusty_arm64-userdebug make -j Change-Id: I4c309f7f30c3aedba7754d20442eefd75bd990eb
* | | [automerger skipped] Remove device-only modules from PRODUCT_HOST_PACKAGESDan Willemsen2019-04-090-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 620ea38a0a -s ours am skip reason: change_id I7ceb0f4549ea013d9792d2944f7567d663c70c52 with SHA1 072ad3fe28 is in history Change-Id: I01e1251197d8478a0bb1fac23120a57389a3097b
| * | | Remove device-only modules from PRODUCT_HOST_PACKAGESandroid-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseDan Willemsen2019-04-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes adbd, which is almost definitely not required. Bug: 123925742 Test: treehugger Change-Id: I7ceb0f4549ea013d9792d2944f7567d663c70c52 Merged-In: I7ceb0f4549ea013d9792d2944f7567d663c70c52 (cherry picked from commit 072ad3fe286a2c89a34c42bbc2a3eaa0f79bd057)
* | | | Remove device-only modules from PRODUCT_HOST_PACKAGES am: 072ad3fe28Dan Willemsen2019-04-091-2/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | am: c11e3d9801 Change-Id: If013e9712b035ce6d6e6b7051f0001aedf51c550
| * | | Remove device-only modules from PRODUCT_HOST_PACKAGESDan Willemsen2019-04-091-2/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | am: 072ad3fe28 Change-Id: Ib29ac94b464499a1269b7d772daae7c33e835611
| | * | Remove device-only modules from PRODUCT_HOST_PACKAGESandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Dan Willemsen2019-04-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes adbd, which is almost definitely not required. Bug: 123925742 Test: treehugger Change-Id: I7ceb0f4549ea013d9792d2944f7567d663c70c52
* | | | Enable Trusty Gatekeeper 1.0 and Keymaster 3.0 am: 3a99f0fba1Matthew Maurer2019-04-044-1/+217
|\| | | | |_|/ |/| | | | | | | | | | | am: dcade8aace Change-Id: I8627cac0fca649cb9160211f82d7c9dd65050da5
| * | Enable Trusty Gatekeeper 1.0 and Keymaster 3.0Matthew Maurer2019-04-044-1/+217
| |\| | | | | | | | | | | | | | | | am: 3a99f0fba1 Change-Id: Iaf343ad05b28691cfe4a9dada7d7db021ef0f961
| | * Enable Trusty Gatekeeper 1.0 and Keymaster 3.0Matthew Maurer2019-04-024-1/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activates both services, and installs VTS to allow for testing them. Fails one subtest of keymaster@3.0 VTS at the moment, but so does the default emulator, so this is either a bug in system/keymaster or VTS. Bug: 127700127 Test: VTS for gatekeeper@1.0, VTS for keymaster@3.0 Change-Id: I53a901c090dd5cbaddab0d430e28f9b7de8dda89
* | | Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | am: 2540d813fe Change-Id: I50c6eec2baedfd4715098a0021a9d800ccf7ff9d
| * \ \ Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-022-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Change-Id: I2ae0fcb073b8c38d656541aa281518fb684a647f BUG: 129345239
* | | | | Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|\| | | | | |/ / / |/| | | | | | | | | | | | | | | am: 93698a8eba Change-Id: Id4222d339785f7e503e2a4ad4eb32eb981dff203
| * | | Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-03-296-4/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Change-Id: I214707a72516df72807110d6ffc4d6c89a52f965 BUG: 129345239
* | \ \ \ Add com.android.runtime APEX am: e815a66c4d am: b0a0894c86Matthew Maurer2019-04-012-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | am: 4d60eb9e91 Change-Id: I3bd5d0d9ed4547c787bc7688a922a685b9553060
| * | | | Add com.android.runtime APEX am: e815a66c4dMatthew Maurer2019-04-012-1/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | am: b0a0894c86 Change-Id: I3e545f54ef580fadebcae356d00ebdee32da2cca
| | * | | Add com.android.runtime APEXMatthew Maurer2019-04-012-1/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | am: e815a66c4d Change-Id: Ia9748581fa5c16cb8b4f51f2df6af400b021842a
| | | * | Add com.android.runtime APEXMatthew Maurer2019-04-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bloats the image a bit, but it's mandatory now - we won't get past early boot without it, since apexd won't signal init that it's done loading. If you have seen repeated log lines about binder transaction failures, this is the fix for that. Bug: 124277696 Test: Boot with trusty, actually get to shell again Change-Id: I4a8370dcc796834a2b76456b5b7d0a40e87f1b56
* | | | | Configure and launch storageproxyd am: aa426ec076 am: bcacaf315cMatthew Maurer2019-03-256-4/+20
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | am: a053073c74 Change-Id: If28001dde6286f19b4d3a2c835c8288874b0e3eb
| * | | Configure and launch storageproxyd am: aa426ec076Matthew Maurer2019-03-256-4/+20
| |\| | | | | | | | | | | | | | | | | | | | | | am: bcacaf315c Change-Id: I5ec364bc9f6d8b31525f8b4e87e6bbb8290472cd
| | * | Configure and launch storageproxydMatthew Maurer2019-03-256-4/+20
| | |\| | | | | | | | | | | | | | | | | | | | | am: aa426ec076 Change-Id: I4bacb58cde97bcdd58e82621d1973d53954d2013
| | | * Configure and launch storageproxydMatthew Maurer2019-03-216-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 124277696 Test: Boot with trusty, run trusty-ut-ctrl "com.android.storage-unittest.td" Change-Id: Idc447015f222cb5a5cbcc2be2ca84c73d4045d1d
* | | | Remove host-only packages from PRODUCT_PACKAGES am: 15084b78fc am: a8df7365ceDan Willemsen2019-03-191-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: f76fa723ea Change-Id: I1d4e68e269f1a91b2763b6d3789ea9635724b3cb
| * | | Remove host-only packages from PRODUCT_PACKAGES am: 15084b78fcDan Willemsen2019-03-191-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: a8df7365ce Change-Id: I3a36416f6dc5005a01ced634eece177477c08242
| | * | Remove host-only packages from PRODUCT_PACKAGESDan Willemsen2019-03-191-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am: 15084b78fc Change-Id: I2e9e9c7570f2bccb20c4e9818d88cf43d4dea5d7
| | | * Remove host-only packages from PRODUCT_PACKAGESDan Willemsen2019-03-191-1/+0
| | | | | | | | | | | | | | | | | | | | Test: treehugger Change-Id: Icb086bc01df3664752aed62f7831a1f15165e16b
* | | | [automerger skipped] Add PRODUCT_HOST_PACKAGES for all host modules in ↵Dan Willemsen2019-03-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PRODUCT_PACKAGES am: ad2a412bf5 am: 1be1e859e5 am: 4e17072f5c -s ours am skip reason: change_id If143540edce57d8e40292dc228bf7a40ed989821 with SHA1 01d3dc9683 is in history Change-Id: I175b9033ca29fe80218baf07b3721d3cc6561e60
| * | | Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGES am: ↵Dan Willemsen2019-03-071-0/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad2a412bf5 am: 1be1e859e5 Change-Id: I3cbf3c2fc828eeb2a4cced74fda49fe15bf37c53
| | * | Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGESDan Willemsen2019-03-071-0/+11
| | |\| | | | | | | | | | | | | | | | | | | | | am: ad2a412bf5 Change-Id: I3e419d3a2269a930d858b4581c7df331e7a212a6
| | | * Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGESandroid-q-preview-1Dan Willemsen2019-03-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for splitting PRODUCT_HOST_PACKAGES and PRODUCT_PACKAGES Test: treehugger Change-Id: If143540edce57d8e40292dc228bf7a40ed989821 Merged-In: If143540edce57d8e40292dc228bf7a40ed989821