Commit graph

70821 commits

Author SHA1 Message Date
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
Yi-Yo Chiang
6e701a2cac Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
We don't need these anymore as we now export userdebug_plat_sepolicy.cil
to artifacts dist dir directly, so repack_bootimg don't need to use
boot-(debug|with-debug-ramdisk)-*.img as repack source anymore.

Bug: 202129499
Test: Check presubmit artifacts don't have boot-*debug*.img
Change-Id: I3161e42b00a93177a1a4cb3b22da2218d294b7a7
Merged-In: I3161e42b00a93177a1a4cb3b22da2218d294b7a7
(cherry picked from commit 92f08702dd)
2021-11-24 07:53:39 +00:00
Yi-Yo Chiang
8d2495319b Refactor build logic of boot-debug & vendor_boot-debug
Add PRODUCT variables
  PRODUCT_BUILD_DEBUG_BOOT_IMAGE
  PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE
as toggles to enable/disable building boot-debug & vendor_boot-debug.

Bug: 200945738
Test: m bootimage_debug
Change-Id: Ic032b8594f776f911d7b6345a97d64fed930d890
Merged-In: Ic032b8594f776f911d7b6345a97d64fed930d890
(cherry picked from commit 4d7c613c58)
2021-11-24 07:53:32 +00:00
Bowgo Tsai
00fc943377 Skip building boot-(test-harness|debug).img if not needed
boot-(test-harness|debug).img is not needed for devices with
a /vendor_boot partition. They can use vendor_boot-(test-harness|debug).img
instead.

(Cherry-picked with Ic032b8594f776f911d7b6345a97d64fed930d890 to
solve merge conflict.)

Bug: 200945738
Bug: 196001476
Test: make then checks $OUT/*.img
Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
Merged-In: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
(cherry picked from commit 4bb4d1fb91)
2021-11-24 07:53:20 +00:00
Yi-Yo Chiang
d395c6ff3f Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
If this option is set, then an additional copy of the debug policy can
be installed to the GSI, and the init-second-stage of GSI could load
debug policy from GSI /system_ext when debug-ramdisk is used.

Bug: 188067818
Test: Flash RQ2A.201207.001 bramble-user with debug ramdisk & flash
  gsi_arm64-user from master, device can boot and `adb root` works
Change-Id: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8
Merged-In: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8
(cherry picked from commit 0a468fe904)
2021-11-24 14:34:26 +08:00
TreeHugger Robot
e295d0f5d3 Merge "Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" into sc-v2-dev 2021-11-24 00:58:40 +00:00
Bassem Khalife
ea4df1b901 Update Security String to 2022-01-05
Bug: 207022948

Change-Id: If34c71239a446a49d4521116a35b28418cfcd350
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-24 00:23:30 +00:00
Bassem Khalife
af5392280c Update Security String to 2022-01-01
Bug: 207022948

Change-Id: I4fa24056c5f6a4847431fdd28ff614e851746314
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-23 23:25:57 +00:00
Paul Scovanner
8caabb51fd [automerger skipped] [DO NOT MERGE] am: 9e20227ea5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b51bdb4e9bd2db49be6024038ef7efd9b6b44de
2021-11-23 01:37:49 +00:00
Paul Scovanner
9e20227ea5 [DO NOT MERGE]
Update Security String to 2022-01-05

Bug: 207022948
Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-22 21:45:58 +00:00
Inseob Kim
d29e8b2db8 Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 189161483
Bug: 207344718
Test: m selinux_policy
Change-Id: I48b681fb28c78ea9dca922f5fb58f19a940c1a51
Merged-In: I48b681fb28c78ea9dca922f5fb58f19a940c1a51
(cherry picked from commit 94c27efb68)
2021-11-22 12:10:59 +00:00
Michael Wright
32d117dd52 S V2 is now REL
Bug: 204295952
Test: N/A
Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4
Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4
2021-11-15 23:39:36 +00:00
Michael Wright
5be855c250 Revert platform version to 12
Bug: 204295952
Test: N/A
Change-Id: I899af9326e95b4fcfb778f84b748f56834d54ca8
Merged-In: I7f87d189030e97f47dc81b756d1397b4aa65daf0
2021-11-15 23:39:26 +00:00
Treehugger Robot
202b4413a0 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4 am: 4d15c8b486 am: 3dd45cab17
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16133595

Change-Id: Icd61658877da9c005172cfbafe320b91cdaf0985
2021-11-10 07:38:13 +00:00