Commit graph

70834 commits

Author SHA1 Message Date
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
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 10218c724d)
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 994e4a54f4)
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
Paul Scovanner
16eff988ab [DO NOT MERGE]
Update SPL to 2021-12-05

Bug: 202436544
Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
2021-10-11 22:57:45 +00:00
Paul Scovanner
9cba3016fe Update SPL to 2021-12-05
Bug: 202436544
Change-Id: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
Merged-In: Ie4645b81d47aa677c4237bda8303d6c2e502844f
2021-10-11 20:46:15 +00:00
Paul Scovanner
ec6022f2e5 Update SPL to 2021-12-01
Bug: 202436544
Change-Id: I5f0dea3c6fc94a966c3676cd6ea3cd2684487aff
Merged-In: Ib03873315839e4858f93d1ebbbc17054d46246c9
2021-10-07 21:48:49 +00:00
Colin Cross
14cf8d494f [automerger skipped] Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev am: 2b595c26d1 -s ours
am skip reason: Merged-In Ie8bed4cefed83db5324ad98b6e70cb69b3f82780 with SHA-1 6487d1dfd7 is already in history

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

Change-Id: I43e19d61b2f5e7181bcb7f7406fe1fcb78b6474c
2021-09-29 17:13:23 +00:00
Colin Cross
2b595c26d1 Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev 2021-09-29 16:59:52 +00:00
Colin Cross
177cbf600d Update build_id.mk and version_defaults.mk for SC QPR1
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".

Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:34:43 -07:00
Colin Cross
6487d1dfd7 Update build_id.mk and version_defaults.mk for SC V2
Set BUILD_ID to "SC_V2".

Bug: 201082421
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:33:07 -07:00
TreeHugger Robot
9c80832dbf Merge "[DO NOT MERGE] Update Security String to 2021-11-05" into sc-v2-dev 2021-09-17 22:35:05 +00:00
Paul Scovanner
1509179e5b [DO NOT MERGE]
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
Merged-In: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
2021-09-17 21:52:39 +00:00
Paul Scovanner
c0c4cc2ce5 [automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0 am: 6cbee400fc -s ours am: 8e6eb662d9 -s ours am: 98c2172cb8 -s ours
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa is already in history

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

Change-Id: I6cbc983c1a5074b7016a8b5f0770ae296f98a149
2021-09-17 00:44:20 +00:00
Paul Scovanner
da6c47ed7a [automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0 am: aae5a4b668 -s ours am: dfe7a28d3f -s ours am: d3882c9027 -s ours
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa is already in history

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

Change-Id: Iec21473cd900c07ec0da9a2bed4f7066fb80b2a1
2021-09-17 00:44:05 +00:00
Paul Scovanner
98c2172cb8 [automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0 am: 6cbee400fc -s ours am: 8e6eb662d9 -s ours
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa is already in history

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

Change-Id: I1f836f3d4fa414b45061f3d0aefbebdc1ebec317
2021-09-17 00:29:41 +00:00
Paul Scovanner
d3882c9027 [automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0 am: aae5a4b668 -s ours am: dfe7a28d3f -s ours
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa is already in history

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

Change-Id: I36a66aa6b38bdb6220990fce2813ff61a1f0428f
2021-09-17 00:29:37 +00:00
Paul Scovanner
8e6eb662d9 [automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0 am: 6cbee400fc -s ours
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa is already in history

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

Change-Id: I8106c5d8d22e1098f59f44a94282ec83767add27
2021-09-17 00:18:14 +00:00
Paul Scovanner
dfe7a28d3f [automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0 am: aae5a4b668 -s ours
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa is already in history

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

Change-Id: I91625dad026b66b4ef2081d9364d9ba1c3d7aa64
2021-09-17 00:17:05 +00:00
Paul Scovanner
6cbee400fc Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: Ie154e0884c9b69e7e5c6f0306b45f5076a604a63
2021-09-16 23:53:56 +00:00
Paul Scovanner
aae5a4b668 Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: I028ed970b5886d6a3f6b52359c73f15154b720bf
2021-09-16 23:53:56 +00:00
Paul Scovanner
e297219ec0 Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: Ibcb8fb2c1a8b42612f922a3f9e60919f1f8f810e
2021-09-16 23:40:36 +00:00
Paul Scovanner
5593bbe1f7 Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: I03c662f3d629a85488189aaf39acd0708ba90f5c
2021-09-16 23:22:02 +00:00
Paul Scovanner
51b1e117c7 Update Security String to 2021-11-01 am: bdb63576ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: Ie3653c7ae59538693a31536196c881903475fabb
2021-09-16 23:04:31 +00:00
Paul Scovanner
bdb63576ff Update Security String to 2021-11-01
Bug: 199784479
Change-Id: Iaf0b0863f6a4e667a5a8f291e1252d8d2dff1ec6
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 19:03:08 +00:00