Commit graph

78714 commits

Author SHA1 Message Date
Cole Faust
c091ee15fb Merge "Remove usages of long-form variables" am: b760b469c7 am: 85f941cf3a
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287

Change-Id: I0cab896091bd7a668a23c3dbea13bbcb09b0b6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:06:29 +00:00
Cole Faust
2c90bc41c8 Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false" am: 95601112d5
Original change: https://android-review.googlesource.com/c/platform/build/+/2061701

Change-Id: I52e14079ac1f8c7592361b8818643317aeb11e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:39:42 +00:00
Cole Faust
547767afb8 Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddbfa
Original change: https://android-review.googlesource.com/c/platform/build/+/2063512

Change-Id: I3d98fec7c04e8e846821eedcc0ab495055ba79dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:45 +00:00
Cole Faust
414100caeb Optionally dump RBC variables at the end of config.mk am: ec8316de2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2063509

Change-Id: Ia4f6119c1f325cf26198891d9d17fc26c63cc7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:44 +00:00
Cole Faust
85f941cf3a Merge "Remove usages of long-form variables" am: b760b469c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287

Change-Id: I981c3dc7abf4d3508d06ba19bbdbadaa2107327d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:15 +00:00
Cole Faust
95601112d5 Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false" 2022-04-14 16:57:39 +00:00
Cole Faust
1be3bddbfa Merge changes from topic "colefaust_enforce_product_packages_exist"
* changes:
  Implement enforce_product_packages_exist
  Optionally dump RBC variables at the end of config.mk
2022-04-14 16:56:28 +00:00
Cole Faust
b760b469c7 Merge "Remove usages of long-form variables" 2022-04-14 16:55:18 +00:00
satayev
ae590a3b02 Remove sepolicy module from system image.
Attempt #2. Previous attempt didn't remove precompiled sepolicy from
system image, which lead to 1s boot time regression. This is not being removed in the topic.

Include merged-in tag, to skip git_master revert.

Bug: 199914227
Test: presubmit and manual verification
Merged-In: Iafe242c8c7122174788215a02e03c8903316a223
Change-Id: Idea61f53411c541b06d74883711d633b822316d6
2022-04-14 12:26:01 +00:00
Hongguang
bbe4842e31 Filter out TV GSI build targets
Bug: 228179256
Bug: 226020975
Test: lunch gsi_tv_arm-userdebug and gsi_tv_arm64-userdebug
Change-Id: Idee55259d5f24638895afd6eaf76cdf854e5807f
2022-04-14 08:06:47 +00:00
Yurii Zubrytskyi
5b38d64185 Merge "platform/build/make - T is now 33" into tm-dev 2022-04-14 06:21:08 +00:00
Cole Faust
81f1e92ed8 Remove usages of long-form variables
The long-form variables (PRODUCTS.<makefile>.<variable>)
are used to get information about multiple products.
However, they've never really worked correctly, and so
importing multiple products is deprecated behavior.

Remove as many usages of the long-form variables and
multi-product imports as possible.

Bug: 228518445
Test: Manually
Change-Id: I0b67f16360ff8bdcdb39638de739440472bccf76
2022-04-13 15:49:56 -07:00
Cole Faust
e050e8fec0 Implement enforce_product_packages_exist
This is something that didn't show up as a regression
when testing ninja files, but does show up when testing
make variables.

Bug: 229132189
Test: New --quick mode in rbc_dashboard.py
Change-Id: I6c1219cdc5ee1d8b3cc39e8f944e99fc380d4668
2022-04-13 14:48:59 -07:00
Cole Faust
ec8316de2e Optionally dump RBC variables at the end of config.mk
config.mk represents essentially the entire product/board
configuration. In order to develop a "quick" rbc regression
test, dump all the make variables at the end of config.mk.

We can then compare these variable dumps instead of ninja
files, because the ninja files take much longer to generate.

Bug: 229132189
Test: Manually
Change-Id: I4e8371be446b7e511aba22dff58530a6d9ff072f
2022-04-13 14:48:32 -07:00
Steve Berbary
0c2f8a586d [automerger skipped] Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993 am: db8f5e169f am: 2c9b20bb14 am: 55d0c93061 -s ours am: fa60b535d5 -s ours am: 238974b9ec -s ours
am skip reason: Merged-In Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c with SHA-1 ee052ac0e5 is already in history

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

Change-Id: Id9f8b83a9d07fdd7177e3258183dc589701ef2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 20:40:09 +00:00
Melisa Carranza Zúñiga
93fa6589df Merge "Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc"" into tm-dev 2022-04-13 20:36:42 +00:00
Steve Berbary
238974b9ec [automerger skipped] Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993 am: db8f5e169f am: 2c9b20bb14 am: 55d0c93061 -s ours am: fa60b535d5 -s ours
am skip reason: Merged-In Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c with SHA-1 ee052ac0e5 is already in history

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

Change-Id: I64cad65c3b0013160a4089963615c62e7bc3823a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 20:15:56 +00:00
Steve Berbary
fa60b535d5 [automerger skipped] Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993 am: db8f5e169f am: 2c9b20bb14 am: 55d0c93061 -s ours
am skip reason: Merged-In Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c with SHA-1 ee052ac0e5 is already in history

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

Change-Id: Ic7c0e781df2a87b120c9b6801614ba09d25f7b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:56:37 +00:00
Steve Berbary
404ae84950 [automerger skipped] Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993 am: db8f5e169f am: 2c9b20bb14 am: 984c0914a7 -s ours
am skip reason: Merged-In Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c with SHA-1 ee052ac0e5 is already in history

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

Change-Id: I82384f7c6edfb5bfaf6e0ed5ca39ea0d6c7d4ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:49:42 +00:00
Steve Berbary
55d0c93061 Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993 am: db8f5e169f am: 2c9b20bb14
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363

Change-Id: I48f2868d85de5a7be4eb37278e791403cee6aaa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:34:13 +00:00
Steve Berbary
984c0914a7 Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993 am: db8f5e169f am: 2c9b20bb14
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363

Change-Id: Ie6f02bb647d15da40cd411c17f1720f3154acd71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:33:19 +00:00
Steve Berbary
2c9b20bb14 Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993 am: db8f5e169f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363

Change-Id: I96b3ee375123e21e8a4c579f04e8680a653f0422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:09:01 +00:00
Steve Berbary
db8f5e169f Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e am: 60b2df3993
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363

Change-Id: I4dd22b07c42c97b6d2cfc32e8a764dd10397bc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 18:45:39 +00:00
Bob Badour
1fd4bda634 Create lists of projects to share per dist target
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses
Change-Id: I23ee3a983c205ee2a62e47edc2039b7cc713c420
2022-04-13 11:27:59 -07:00
Steve Berbary
60b2df3993 Update Security String to 2022-06-01 am: ff8d7d7825 am: 92e198169e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363

Change-Id: I3ff0f3cb0dd72abe5eb9274653cddb53d1dac245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 18:22:45 +00:00
Bob Badour
213095a919 Rename listshare and checkshare.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses
Change-Id: I223c4496d776a1bbd4fdce31ed79a638ed3491d8
2022-04-13 11:04:43 -07:00
Steve Berbary
92e198169e Update Security String to 2022-06-01 am: ff8d7d7825
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363

Change-Id: I6ab2d9b65e8166c0c3bcd8356dee7bc2c47fa0e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 18:01:52 +00:00
Melisa Carranza Zúñiga
61e1dd0da5 Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc"
This reverts commit 8fe9e3a2c7.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I28ae2afbb1083e215f4e0a27a9164133cd73dd76
2022-04-13 16:23:45 +00:00
Melisa Carranza Zúñiga
ef72d2822e Merge "Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd"" into tm-dev 2022-04-13 13:51:51 +00:00
Bob Badour
b03c16badc Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I4ee8fd67ee30a3e21723e13642fdb89cd626a2dd
2022-04-12 18:57:15 -07:00
Melisa Carranza Zúñiga
69e6d82106 Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd"
This reverts commit 6e6c22c70e.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I99524d13811028a4036aa85c74cf10974fe08165
2022-04-12 23:22:11 +00:00
Dan Shi
dadf7ca475 Package vts kernel tests in general-tests.zip
Bug: 228204473
Test: m dist general-tests
Change-Id: Ic6dac4427f1cc2c3bbfdb6905936e2478e5a4350
2022-04-12 15:50:53 -07:00
Cole Faust
1c08360ca8 Evaluate intermediate products properly
When an intermediate product is evaluated, it needs to
act as if it's the only product being evaulated. However,
currently, if it inherited a makefile that was also being
inherited by the overall top level product via a different
path, it would not get the values from that makefile.

Copy the configs dictionary before evaluating each product
that needs artifact path requirements, and create seperate
postfix orders for all of them that don't contain any products
that they don't inherit from.

Bug: 221312707
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I235ad78d587a2e315ba446b5e126d8f6d0fbbea7
2022-04-12 15:25:14 -07:00
Cole Faust
5d46c6133b Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false
Some products clear PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS
in order to disable it. But oftentimes this clearing relies on
the fact that clearing a variable will also cause it to not
inherit from any already-inherited files. Starlark doesn't support
this inheritance behavior, so allow setting
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false so that it
can be explicetly disabled instead of relying on the clearing
behavior.

Bug: 221312707
Test: Manually
Change-Id: I03a227911c6985a65fc5d210682bbd4ac9bd6747
2022-04-12 13:43:28 -07:00
Yurii Zubrytskyi
97191b2095 platform/build/make - T is now 33
Bug: 225745567
Test: Build
Change-Id: If115998c2ef9ef58329faa937e11d673f5585aab
2022-04-12 12:47:25 -07:00
Treehugger Robot
f18826ae8c Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d am: ffa398e6a2 am: a98fd151ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990

Change-Id: I7cd8b1c59323e9deb314e8f2d9b17e4d8a57bd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:19:48 +00:00
Treehugger Robot
a98fd151ea Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d am: ffa398e6a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990

Change-Id: I5112f75f2edc2701819592fbca88d28bdbd5bee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:59:51 +00:00
Treehugger Robot
ffa398e6a2 Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990

Change-Id: I54635a2f6372bd81ab082a8b0ad07c8ceb5f8da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:43:57 +00:00
Treehugger Robot
7bc6d0e71d Merge "Put javac, d8 and r8 rules into RBE ninja pool" 2022-04-12 14:27:24 +00:00
Jeff Hamilton
9742b1eb9f Merge changes from topic "presubmit-am-a5f5938f12924a3c9c42aad60c88563d" into tm-dev
* changes:
  [automerged blank] DO NOT MERGE: Change the build ID to M_2022_05. 2p: 5e9086d9e1
  DO NOT MERGE: Change the build ID to M_2022_05.
2022-04-11 23:37:14 +00:00
Treehugger Robot
d816479292 Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69 am: 5324ea0ca6 am: 2de37f9424
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032

Change-Id: I2751ba90417c8960ab5539f2fe181c66b4c69b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:39 +00:00
Treehugger Robot
fdfbd833eb Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6 am: 6687e127b0
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I5a6aa6499b4c39a8933ffee3d622023f2e8e0bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:09 +00:00
Treehugger Robot
2de37f9424 Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69 am: 5324ea0ca6
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032

Change-Id: I05a20192bdbb375729a7b19fa0215b5223bc4727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:26:52 +00:00
Treehugger Robot
6687e127b0 Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I3ee4934b40b57652945d81dea7a3f63b495ae5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:26:21 +00:00
Treehugger Robot
5324ea0ca6 Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032

Change-Id: Iae8c43ab5fa0236b75b98baa34ab429ab4051a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:11:51 +00:00
Treehugger Robot
7c30a61bc6 Merge "Non-module targets." am: ff15a27bd7
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I188d24d5bcfbd11d5ad1b894e3ddc211a882d48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:11:01 +00:00
Treehugger Robot
2f6aa08f69 Merge "Remove unused combine-notice-files macro." 2022-04-11 19:42:48 +00:00
Treehugger Robot
ff15a27bd7 Merge "Non-module targets." 2022-04-11 19:42:29 +00:00
TreeHugger Robot
97ca005658 Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp am: 31d5f5bb57
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615283

Change-Id: Iee3240448514a7486bbc66427f6bd5bfdb045af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 19:37:43 +00:00
TreeHugger Robot
31d5f5bb57 Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Update Security String to 2022-06-05 2p: ed13206d0e
  Update Security String to 2022-06-05
2022-04-11 19:01:43 +00:00