Commit Graph

72721 Commits

Author SHA1 Message Date
Yi-Yo Chiang
0a468fe904 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
2021-09-17 20:53:56 +08:00
Jingwen Chen
0e4eba1544 Remove module_name_to_label short circuit from m.
This wasn't adding much value, let's remove it for now until we decide
on how mixed builds will be exposed for users later.

Test: USE_BAZEL_ANALYSIS=1 m droid
Change-Id: I16465fd7759646964ea8c50aab6ab91f47c5e8d1
2021-09-17 08:45:30 +00:00
Treehugger Robot
ff5ae8967d Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814 am: d656f50618 am: b939ae8c2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032

Change-Id: I1a34002186eee09649da3433c05d6a39b0d37102
2021-09-17 06:44:26 +00:00
Treehugger Robot
b939ae8c2a Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814 am: d656f50618
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032

Change-Id: I5eed84b57b03d81777e52ed116118820718b7383
2021-09-17 06:29:30 +00:00
Treehugger Robot
d656f50618 Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032

Change-Id: I2bda18219770a634add3716a3de215b8fc41cba6
2021-09-17 06:08:53 +00:00
Treehugger Robot
1646ba0814 Merge "Stop disting monolithic SDK for Mac SDK builds" 2021-09-17 05:55:47 +00:00
Paul Scovanner
027b2b7c21 [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: I0fbe98bf070228dbb1c18cb2d43ef24bb60e4472
2021-09-17 00:46:26 +00:00
Paul Scovanner
1f8b5ddf8a [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: Id0c6d30dab17521506415d616218be379aa13a24
2021-09-17 00:46:20 +00:00
Paul Scovanner
543b2bc50b [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: dc89987284 -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: I2e72e1adf11746808cb4317ab1c8a497ec50b8d1
2021-09-17 00:43:45 +00:00
Paul Scovanner
735405b2a2 [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: 01b23ce87c -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: Ie6958ff55af8808b5f724138363a3e1f347cf6bc
2021-09-17 00:43:40 +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
dc89987284 [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: If59f94fbd407263d4eb014d42eacba147ec78beb
2021-09-17 00:28:14 +00:00
Paul Scovanner
01b23ce87c [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: I814ca81603ae7d17db0af19a686ff89c33ed2b83
2021-09-17 00:28:06 +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
Dan Willemsen
616e7fd9b6 Stop disting monolithic SDK for Mac SDK builds
The Mac SDK build is being reduced to just the build-tools and
platform-tools packages. I'm still working on refactoring those builds
not to require the monolithic SDK to be built first, but we can at least
stop distributing it (and other related files) now.

Most of these checks can likely go away once the build refactor is
complete, since we'll be able to move away from the `sdk` target to
something more specific. Right now there's a lot of logic around sdk
being in MAKECMDGOALS that I don't want to unravel with the current
build logic.

Bug: 187222815
Change-Id: I1f711ce063170e41078ad4a125bcd77340a1746c
2021-09-16 14:54:38 -07:00
David Anderson
17e516372d Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f am: cc21670121 am: 097b905051
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097

Change-Id: I84397899445b4a25dc345155b1144618ec8c83e3
2021-09-16 20:33:45 +00:00
David Anderson
097b905051 Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f am: cc21670121
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097

Change-Id: I95f71747d3e54a321755017f98abb64327b14653
2021-09-16 20:12:21 +00:00
Treehugger Robot
e924552033 [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f -s ours am: b476242ced -s ours am: f0ea141e5d -s ours
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f is already in history

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

Change-Id: I160730118ed965b65034a0ce2afa7cbda8fbc879
2021-09-16 19:52:34 +00:00
David Anderson
cc21670121 Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097

Change-Id: I9111ffc26870f62714d869fdf946c0a42f3c6232
2021-09-16 19:48:20 +00:00
Treehugger Robot
f0ea141e5d [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f -s ours am: b476242ced -s ours
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f is already in history

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

Change-Id: I28d4695e1c687aa077498bd8bfe258480f41087d
2021-09-16 19:38:56 +00:00
David Anderson
dfc9d7912f Merge "Avoid too much reserved_size for erofs image" 2021-09-16 19:36:29 +00:00
Treehugger Robot
b476242ced [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f -s ours
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f is already in history

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

Change-Id: Ia406d5b1f8d1529c9af066499a4d15d118e410b6
2021-09-16 19:23:57 +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
Presubmit Automerger Backend
dac931580c [automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa am: 032007da30 -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/+/15821927

Change-Id: I688051fcda66ebc580d531276a8db090bb0de390
2021-09-16 19:01:37 +00:00
Paul Scovanner
85e54a64cb Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp am: 3e2043263b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024

Change-Id: I0b45033195509dcf4beae84435084d5c166dabbb
2021-09-16 19:01:07 +00:00
Presubmit Automerger Backend
0d9963c809 [conflict] [DO NOT MERGE] 2p: 0449bb97fa am: 541828d6f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024

Change-Id: I03abf503bd096fb3f1f00e438dc321aa8e10ec31
2021-09-16 19:01:07 +00:00
Treehugger Robot
258fca9a8f Merge "Move the stable code from version_defaults.mk to version_util.mk." 2021-09-16 18:56:09 +00:00
Yuntao Xu
2bf33c458f move cts-test-coverage
Moved cts-test-coverage from cts/build/ to build/make/core/tasks/cts.mk.

Bug: 190635892
Test: m cts-test-coverage
Test: TreeHugger
Change-Id: I161adebc356b693329dfe48661476840c32beaa6
2021-09-16 11:55:08 -07:00
Paul Scovanner
3e2043263b Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp
* changes:
  [conflict] [DO NOT MERGE] 2p: 0449bb97fa
  [DO NOT MERGE] Update Security String to 2021-11-05
2021-09-16 18:47:38 +00:00
Daniel Norman
9fb65dcb87 Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e am: 4495b649ef am: adbf8de8d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615

Change-Id: I432d7aac60d833a35e03f00120c0935d6cd69650
2021-09-16 18:14:03 +00:00
Daniel Norman
adbf8de8d3 Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e am: 4495b649ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615

Change-Id: Ia857f853b2f87f47c72a1a624fa9d93fd80ed596
2021-09-16 18:01:02 +00:00
Daniel Norman
4495b649ef Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615

Change-Id: I71cca612bf0925be76fd7d4a91d652af12be4ca2
2021-09-16 17:44:49 +00:00
Yuntao Xu
4700488712 [automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638d3 am: 34f50fefad -s ours am: d59357cb32 -s ours
am skip reason: Merged-In I63b2da75391221119025b597257c26906718cf77 with SHA-1 2bbe1fe2d4 is already in history

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

Change-Id: Ibeea1c1ec7c22fc2b25232826c4e29b0069a5cd4
2021-09-16 17:40:48 +00:00
Yuntao Xu
d59357cb32 [automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638d3 am: 34f50fefad -s ours
am skip reason: Merged-In I63b2da75391221119025b597257c26906718cf77 with SHA-1 2bbe1fe2d4 is already in history

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

Change-Id: If2fa2dc8ecbf8367436c0057a2c43c48efba4eb2
2021-09-16 17:40:19 +00:00
Daniel Norman
a529e0fd2e Merge "Build vendor images first when rebuilding with vendor_otatools." 2021-09-16 17:29:43 +00:00
Yuntao Xu
34f50fefad Merge "Add android-cts-verifier.zip" am: a1b1f638d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673

Change-Id: Ib46b9e711faf8f663e1ba26a2e2ccf8d13b07f57
2021-09-16 17:22:44 +00:00
Yuntao Xu
a1b1f638d3 Merge "Add android-cts-verifier.zip" 2021-09-16 17:06:16 +00:00
Presubmit Automerger Backend
541828d6f0 [conflict] [DO NOT MERGE] 2p: 0449bb97fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927

Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
2021-09-16 13:20:30 +00:00
Presubmit Automerger Backend
032007da30 [automerge] [DO NOT MERGE] 2p: 0449bb97fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927

Bug: 199784479
Change-Id: Ifa2b7532b7d59bd2b7f9ad87c3a00698cb7c215d
2021-09-16 11:39:22 +00:00
Paul Scovanner
0449bb97fa [DO NOT MERGE]
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 11:39:07 +00:00
Treehugger Robot
0b048475f1 Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec am: 36ebb662c3 am: 7a72ba165b
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192

Change-Id: I8cfdc7dab454b7a11d862385fd972472b13d4fe0
2021-09-16 10:09:02 +00:00
Treehugger Robot
7a72ba165b Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec am: 36ebb662c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192

Change-Id: I707952bbc214cf8d9e9d79905a8fe3998061b26e
2021-09-16 09:54:13 +00:00
Treehugger Robot
36ebb662c3 Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192

Change-Id: I6db74dc855b814c00ee8cb90628b673633ae3d44
2021-09-16 09:38:52 +00:00