p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
70,805 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

70805 Commits

Author SHA1 Message Date
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
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 92f08702ddd42959508279eaf88071564bbc5b54)
 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 4d7c613c58cb0578893996887e8270a3bd8cb069)
 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 4bb4d1fb9165b124f67bb6f405503ca4ae1ecef2)
 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 0a468fe904768240fe011f1c47fa89b3165c265c)
 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 94c27efb68b124fad1f291fb7c3865777403d20f)
 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
Michael Wright 24d3b88704 S V2 is now 32 
Bug: 204295952
Test: N/A
Change-Id: I0627247e0b40c6c912584d55417671d20167b7c2
Merged-In: I0627247e0b40c6c912584d55417671d20167b7c2
 2021-11-05 19:39:39 +00:00
Cheonho Park 51fb042cc2 Use findstring to check MODULE_BUILD_FROM_SOURCE 
Android 12 can have _compressed target
(e.g com.google.android.conscrypt_compressed),
changed function from `filter` to `findstring`

Same change applied to com.google.android.art check

Also modify to check `true` value of the MODULE_BUILD_FROM_SOURCE
to filter out both unset variable and `false`

Test: adding one error code temporally, install prebuilt
  train, and check result with,without this fix

    MODULE_BUILD_FROM_SOURCE := true
  + $(error we are here, true $(PRODUCT_PACKAGES))
  endif

Bug: 197282276
Change-Id: I864ba1bb5da61ccc6b8576029ab6c569959b2c93
(cherry picked from commit 32c048c379)
 2021-10-30 03:24:33 +00:00
Treehugger Robot 3dd45cab17 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4 am: 4d15c8b486 
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Bug: 201591516
Change-Id: Id124e6eb6d5c8c0ec31aca6b5878577519125c30
(cherry picked from commit 10218c724d1bd7a29d4ae9eacccdbb7f39682925)
 2021-10-29 21:43:12 +00:00
Howard Chen 7cec1d3e70 DO NOT MERGE Disable the delete_all_keys feature for GSI 
DO NOT MERGE as the main branch is fixed by aosp/1826054.

Bug: 197914756
Bug: 203618478
Test: run GSI with DSU on a Pixel device

Change-Id: I78ee95f99764bee71bf3bcccb992ee35fa80603b
(cherry picked from commit 994e4a54f42808b369e8b28f16c52e0647fd8bb6)
 2021-10-26 13:31:25 +08:00
Paul Scovanner d852e44fd2 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: a20327484d -s ours am: 7c3acbad19 -s ours am: 54f234ae38 -s ours 
am skip reason: skipped by user pscovanner

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

Change-Id: Ic586c9b2beba01f3f6b29a9ace4a0493a5132a7c
 2021-10-18 20:55:23 +00:00
Paul Scovanner 54f234ae38 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: a20327484d -s ours am: 7c3acbad19 -s ours 
am skip reason: skipped by user pscovanner

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

Change-Id: I1400c62e40573c314b8595e30075fa98c56b562a
 2021-10-18 20:35:15 +00:00
Paul Scovanner 7c3acbad19 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: a20327484d -s ours 
am skip reason: skipped by user pscovanner

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

Change-Id: I6e5814a2fcdc75ce8a8e5ad341fa3d27fcbc9cbf
 2021-10-18 20:17:01 +00:00
Paul Scovanner 042b6c90e5 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: 1be1ef6734 -s ours am: fd5bf79dfd -s ours am: 959d1a0691 -s ours 
am skip reason: skipped by user pscovanner

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

Change-Id: Ia5cfaef930e9f2b44bba6264c30e93aec5403226
 2021-10-18 17:11:09 +00:00
Paul Scovanner 959d1a0691 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: 1be1ef6734 -s ours am: fd5bf79dfd -s ours 
am skip reason: skipped by user pscovanner

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

Change-Id: I2f3de7e815758967f3a3f90426bb37820ad9cbd9
 2021-10-18 16:56:05 +00:00
Paul Scovanner fd5bf79dfd [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: 1be1ef6734 -s ours 
am skip reason: skipped by user pscovanner

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

Change-Id: I62f2ae5be48f8952ce01538a4a6be49f295e84e4
 2021-10-18 16:34:09 +00:00
Paul Scovanner 1be1ef6734 Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I7e29a87a03bea575453235ccdf6d391e7dc91a60
 2021-10-12 21:03:47 +00:00
Paul Scovanner a20327484d Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I7693d6ef443a5be9ffce34be50d852cb8c4bdc21
 2021-10-12 21:03:47 +00:00
Paul Scovanner 822db71705 Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I869a65437ba0907febbaa2966746f8665113a855
 2021-10-12 20:49:57 +00:00
Paul Scovanner 48181f100e Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I468bc3e4cc0f329aff8768e375ae42ee1653c841
 2021-10-12 20:39:24 +00:00
Paul Scovanner 38b8a44db6 Update SPL to 2021-12-01 am: ec6022f2e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: Ic290b491b87019fa00d4b6172e438672da23dffd
 2021-10-12 20:27:26 +00:00
Paul Scovanner d342497aec [automerger skipped] [DO NOT MERGE] am: 16eff988ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe333dd922409f551431d3a16d603c853aafd6f4
 2021-10-12 18:30:13 +00:00