Commit graph

70834 commits

Author SHA1 Message Date
Colin Cross
5ff4380b5d Add a keys argument to tapas
Add a keys argument to tapas that allows specifying devkeys to
use internal aosp_devkeys_* products that use the internal
devkeys, which will allow building unbundled apps that use platform
keys for testing.

Bug: 216553104
Test: tapas CarMediaApp devkeys
Change-Id: I2161be9e15f99713e11d22901d6eb7ad3c420093
Merged-In: I2161be9e15f99713e11d22901d6eb7ad3c420093
2022-02-07 18:50:22 +00:00
Bassem Khalife
50652dcb86 [automerger skipped] Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 8959f0ef47 am: 6b683065ea am: 8c19435f5a -s ours
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: Ie7dee86ccc5529e6ebbc5bd19fa99cb639eb118e
2022-01-18 21:17:04 +00:00
Bassem Khalife
b1bb19184b [automerger skipped] Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 87a92018fc am: 6833559fbd am: ac9415f174 -s ours
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783

Change-Id: I15b77b09b4587dcbc20bd2ffc4860a337261bf66
2022-01-18 21:16:58 +00:00
Bassem Khalife
8c19435f5a Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 8959f0ef47 am: 6b683065ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: Ie211c616f7ad1336d6e082fc576df24b398cbb1c
2022-01-18 21:04:08 +00:00
Bassem Khalife
ac9415f174 Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 87a92018fc am: 6833559fbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Bug: 214731054
Bug: 211820647

Change-Id: Ifd4306f79809fb8c744d2c601bb2dec4038c5782
Merged-In: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863
2022-01-16 04:10:36 +00:00
Bassem Khalife
6b683065ea Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 8959f0ef47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I9541d529c6c20906bb78d6a4f79cb827db9d36e5
2022-01-15 21:45:22 +00:00
Bassem Khalife
6833559fbd Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 87a92018fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I652af09a72cae6f5d9ea9d74b505e36e115c7a5b
2022-01-15 21:37:55 +00:00
Bassem Khalife
8959f0ef47 Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I901e7c0ca2054502bda6542c223f07b129ac461f
2022-01-15 21:26:10 +00:00
Bassem Khalife
87a92018fc Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I6587646279387e16f46698d11b28b36ad887e286
2022-01-15 21:26:06 +00:00
Bassem Khalife
0c1d6c0f4e Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: Ifbb2444e7140a95f841f3d31c59aed0b278ec9e0
2022-01-15 21:08:58 +00:00
Bassem Khalife
da539453f8 Update security string to 2022-03-01 am: 389f21950c am: eb389ab195
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I3d02490cbef81683eab9b2aa02f3c5a7fcf9822e
2022-01-15 20:49:30 +00:00
Bassem Khalife
eb389ab195 Update security string to 2022-03-01 am: 389f21950c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: Iaba1fff7f3f45062087c7c276a48467324389b52
2022-01-15 20:33:28 +00:00
Bassem Khalife
389f21950c Update security string to 2022-03-01
Bug: 211820647

Change-Id: I9afb39715b0e470866a344246566e6414071ae6a
Merged-In: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863
2022-01-09 01:08:35 +00:00
Bassem Khalife
16caffd2e7 Update Security String to 2022-03-05
Bug: 211820647
Change-Id: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863
2022-01-07 00:50:18 +00:00
Savitha Gouda
1aca51b6e2 [automerger skipped] Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e am: fd931df2df am: 794958fe8e -s ours am: c78d35a3dc -s ours
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I9a940289f12f98b85ceebffb92dffb0423a75af0
2021-12-17 04:20:22 +00:00
Savitha Gouda
7d33465b3b [automerger skipped] Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e am: 505f869ef7 am: fb405feec3 -s ours am: 231e836ffc -s ours
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: Idae02bc9c711fb3757fea36fd776b6265a99e534
2021-12-17 04:20:13 +00:00
Savitha Gouda
c78d35a3dc [automerger skipped] Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e am: fd931df2df am: 794958fe8e -s ours
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I90cb441ac521562d275bf306092757fbcd325eae
2021-12-17 03:58:24 +00:00
Savitha Gouda
231e836ffc [automerger skipped] Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e am: 505f869ef7 am: fb405feec3 -s ours
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I7662ac50b57afdff26710cc89ec54b2096b1a2fa
2021-12-17 03:58:04 +00:00
Savitha Gouda
794958fe8e Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e am: fd931df2df
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I73bb4986ae283e8403c54a70c501e2a9a9d56457
2021-12-17 03:49:47 +00:00
Savitha Gouda
fb405feec3 Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e am: 505f869ef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I4f5fc52cd745c849472d845e53efbba87ddb748e
2021-12-17 03:39:36 +00:00
Savitha Gouda
fd931df2df Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I6f6261ad75adcbe590b00c6d07d4a57d60a3a947
2021-12-17 03:17:02 +00:00
Savitha Gouda
505f869ef7 Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: Ic41771d2b79c585e82b630c3c827817d9af22b6c
2021-12-17 03:15:33 +00:00
Savitha Gouda
962fe3597e Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: Ia54081dfe1f062f0e5980d1c41f6fb06883d1b48
2021-12-17 02:43:48 +00:00
Savitha Gouda
4d389c976c Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I425042256920f8ed9324503457639587e9237e0d
2021-12-17 02:28:13 +00:00
Savitha Gouda
5aa365533b Update security string to 2022-02-01 am: dbca77790b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16483514

Change-Id: I9229458512d2a6a53ac42acab6f518df34843267
2021-12-17 02:11:17 +00:00
Savitha Gouda
dbca77790b Update security string to 2022-02-01
Bug: 210005927

Change-Id: I573c92e95022c3f2b47e18646355208bda890386
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
2021-12-17 00:10:52 +00:00
Bassem Khalife
1babda1463 Update Security String to 2022-02-05
Bug: 210005927

Change-Id: I8b7a5dea105d34a7fa987ddb44e94d6f8c94c7cc
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
2021-12-16 22:55:27 +00:00
Nicolas Geoffray
df8b9c17b0 Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev 2021-12-10 18:59:39 +00:00
Yi-yo Chiang
806d08f61d Merge changes from topic "no-more-boot-debug-gki-sc-v2-dev" into sc-v2-dev
* changes:
  Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
  Refactor build logic of boot-debug & vendor_boot-debug
  Skip building boot-(test-harness|debug).img if not needed
2021-12-10 05:36:27 +00:00
Yi-yo Chiang
782fece23d Merge "sign_target_files_apks: adding --allow_gsi_debug_sepolicy" into sc-v2-dev 2021-12-10 04:05:11 +00:00
Yi-yo Chiang
a03f18f45d Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" into sc-v2-dev 2021-12-10 04:05:11 +00:00
Bassem Khalife
b61607b790 [automerger skipped] [DO NOT MERGE] am: fdbbcabca3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16433536

Change-Id: Id995cee3507f548b570ebc7c8a2f4ba1e566d166
2021-12-09 23:47:06 +00:00
Bassem Khalife
fdbbcabca3 [DO NOT MERGE]
Update Security String to 2022-02-05
   
 Bug: 210005927

Change-Id: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
2021-12-09 19:40:31 +00:00
Bassem Khalife
25e59b1139 [automerger skipped] [DO NOT MERGE] Update Security String to 2022-01-01 am: 6e4c4dadb1 -s ours am: ad24fc0ed5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16359379

Change-Id: I5901c5ce368e439e7a411bdfc208be6b19407f35
2021-11-30 23:35:30 +00:00
Bassem Khalife
ad24fc0ed5 [automerger skipped] [DO NOT MERGE] Update Security String to 2022-01-01 am: 6e4c4dadb1 -s ours
am skip reason: Merged-In Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981 with SHA-1 9e20227ea5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16359379

Change-Id: I91b37a03d55c2bbf2b811d363bc01f5fdf800360
2021-11-30 23:18:56 +00:00
Bassem Khalife
6e4c4dadb1 [DO NOT MERGE] Update Security String to 2022-01-01
Bug: 207022948

Change-Id: Id0cffb66a65c60b011d0975ba6b0ff04366472d2
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
Merged-In: Id1ccf89e6cd9e924f9d5c7ca53cdbcd9cd34018b
2021-11-30 18:17:39 +00:00
Bassem Khalife
1d9c044bd2 [automerger skipped] Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87 am: 36133c9d03 -s ours am: 914c259c94 -s ours am: 4877c95bec -s ours
am skip reason: skipped by user bkhalife

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I0a378367b8e862be87e359c2ba19305080ee2ceb
2021-11-30 00:23:58 +00:00
Bassem Khalife
4877c95bec [automerger skipped] Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87 am: 36133c9d03 -s ours am: 914c259c94 -s ours
am skip reason: skipped by user bkhalife

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I746b8461fe71131ba2f8ef6d1eca99cc7ef43bfd
2021-11-30 00:06:12 +00:00
Bassem Khalife
914c259c94 [automerger skipped] Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87 am: 36133c9d03 -s ours
am skip reason: skipped by user bkhalife

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: Ia2c946cecdf7aa82ac54e5b79640c7a5a6171f88
2021-11-29 23:46:29 +00:00
Martin Stjernholm
bef0d6d710 Use prebuilts of the ART Module by default in SC branches.
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

Sanitizer and coverage builds builds are excluded, as are builds using
the products art_module_*, armv8, arm_krait, and others in
device/generic/art.

To keep using ART and libcore sources in local builds, set
SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for
further info.

Cherry-picked from http://ag/15234812.

Merged-in set to https://r.android.com/1801147 to avoid merging into
master and *-plus-aosp branches, where we want to enable prebuilts
separately.

Test: build & boot on Cuttlefish
Bug: 200554575
Change-Id: Id6800fe3564149e6c555b5f68a41b01e9c7dff3f
Merged-In: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
2021-11-29 18:08:52 +00:00
Bassem Khalife
bd3dbd0013 [automerger skipped] Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87 am: c1a6509aa0 -s ours am: 5b525c7012 -s ours am: 45715cc202 -s ours
am skip reason: skipped by user mast

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I1029a08d2599dfcd908582eb8495043fc014d108
2021-11-25 12:37:55 +00:00
Bassem Khalife
45715cc202 [automerger skipped] Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87 am: c1a6509aa0 -s ours am: 5b525c7012 -s ours
am skip reason: skipped by user mast

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: Id8a7cf6654a3996866c02fdfc75b3a03c02bd20d
2021-11-25 12:25:35 +00:00
Bassem Khalife
5b525c7012 [automerger skipped] Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87 am: c1a6509aa0 -s ours
am skip reason: skipped by user mast

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: Idefbe8bbb608790b2825b593246151d052412288
2021-11-25 12:06:23 +00:00
Bassem Khalife
c1a6509aa0 Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: Ie0f2acc39b5b423692c18a9701b29b7686696f37
2021-11-25 00:29:36 +00:00
Bassem Khalife
36133c9d03 Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: Ibad40c3f0dff954b6eeb8057c47a89ad45ab48ca
2021-11-25 00:29:30 +00:00
Bassem Khalife
2c29217e87 Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I8ff4619dfd22ff1a5fea16aa09d47c79bf271c7e
2021-11-25 00:17:18 +00:00
Bassem Khalife
96d63bce8f Update Security String to 2022-01-01 am: af5392280c am: c3a1392249
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I00cf460d1512ce9ef92f029dd7ef31771358425f
2021-11-25 00:01:53 +00:00
Bassem Khalife
c3a1392249 Update Security String to 2022-01-01 am: af5392280c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I8073ba94d72c2ccc8ff471dfef76ea98e49dc6d8
2021-11-24 23:49:24 +00:00
TreeHugger Robot
6cf39dbb91 Merge "Update Security String to 2022-01-05 Bug: 207022948" into sc-v2-dev 2021-11-24 23:28:38 +00:00
Bowgo Tsai
702b8fdfe0 sign_target_files_apks: adding --allow_gsi_debug_sepolicy
https://android-review.googlesource.com/q/topic:gsi_debug_policy
adds userdebug_plat_sepolicy.cil into the GSI system.img to
reduce the steps of repacking a debug ramdisk.

This CL checks that the file userdebug_plat_sepolicy.cil shouldn't
exist before signing, unless the caller explicitly specifies
--allow_gsi_debug_sepolicy to allow it.

Note: also fixes the indentation around the block.

Bug: 188067818
Bug: 201482141
Test: sign_target_files_apks *-target_files-*.zip signed.zip
Change-Id: I56ed328a9ae70cf49dbd3c6efb5a4a8c54e1b7a7
Merged-In: I56ed328a9ae70cf49dbd3c6efb5a4a8c54e1b7a7
(cherry picked from commit 5a73b0ee976dc61fe6fa12e48f15d5ec53f90878)
2021-11-24 07:55:31 +00:00