Commit Graph

76221 Commits

Author SHA1 Message Date
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
ff15a27bd7 Merge "Non-module targets." 2022-04-11 19:42:29 +00:00
Treehugger Robot
3cbef527f0 Merge "revert addition of --skip-soong-test flag" am: 9bc50689c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2060119

Change-Id: I5bea9a572c1257509131f042df2efc196cd87fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 16:37:41 +00:00
Treehugger Robot
9bc50689c9 Merge "revert addition of --skip-soong-test flag" 2022-04-11 16:14:35 +00:00
Albert Martin
e84e7041e2 Merge "Add flag to globally override updateable apexes' min_sdk_version" am: 7366fcbca6
Original change: https://android-review.googlesource.com/c/platform/build/+/2059368

Change-Id: I87968a9fd420f9739d61c93e996217326d33e828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 12:48:42 +00:00
Albert Martin
7366fcbca6 Merge "Add flag to globally override updateable apexes' min_sdk_version" 2022-04-11 12:29:09 +00:00
Sam Delmerico
9d67a905b7 revert addition of --skip-soong-test flag
aosp/2045666 attempted to permit passing the `--skip-soong-tests` flag
through the `b` command to `soong_ui`, but it has been causing problems.

Test: b build '...' --skip-soong-tests is not recognized
Test: build/bazel/ci/bp2build.sh
Change-Id: I02487841d8081218dc941cb04bfa1a9e148ab6af
2022-04-11 12:27:10 +00:00
Treehugger Robot
1080b9f3f6 Merge "Implement multitree lunch" am: 9d1b28ed10
Original change: https://android-review.googlesource.com/c/platform/build/+/2060107

Change-Id: I8f1f7fc98a0e521a9e3347d1b140eefa657857a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 00:41:56 +00:00
Treehugger Robot
9d1b28ed10 Merge "Implement multitree lunch" 2022-04-09 00:19:03 +00:00
Treehugger Robot
1b14ac6ba6 Merge "change logtags dependency to provide java sources" am: 84a39ac3f0
Original change: https://android-review.googlesource.com/c/platform/build/+/2045664

Change-Id: I375f1deeb6430e0b3ec5a3df7f5d54b739e25528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:58:07 +00:00
Treehugger Robot
84a39ac3f0 Merge "change logtags dependency to provide java sources" 2022-04-08 22:37:22 +00:00
Cole Faust
dac2c71fbd Merge "Fix "posix_spawn: Argument list too long" issue" am: ea935b5ad9
Original change: https://android-review.googlesource.com/c/platform/build/+/2056514

Change-Id: I9c5f05d53de58a7c561f312cd51ebca3d32ebee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:04:09 +00:00
Cole Faust
ea935b5ad9 Merge "Fix "posix_spawn: Argument list too long" issue" 2022-04-08 20:44:38 +00:00
Joe Onorato
824608c33d Implement multitree lunch
Test: (cd build/make/orchestrator/core ; ./test_lunch.py)
Change-Id: I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0
2022-04-08 13:42:55 -07:00
Bill Yi
ef46aa1f16 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bd6df21f31 -s ours
am skip reason: Merged-In Ifba8d5912e2c39f2b403c829d44fa6d09468138d with SHA-1 9bb87d3f51 is already in history

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

Change-Id: I40dfe5a20fb048cf87703674359fc0004230b79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:39 +00:00
Bill Yi
efd1c33a85 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 9d994cd06b -s ours
am skip reason: Merged-In Ifba8d5912e2c39f2b403c829d44fa6d09468138d with SHA-1 9bb87d3f51 is already in history

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

Change-Id: I5ac50a96e31ddf5c6429ff11b6be79ab687155c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:21 +00:00
Bill Yi
bd6df21f31 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:24 +00:00
Treehugger Robot
41c46ae68b Merge changes from topic "colefaust_artifact_path_requirements" am: 7b51e8cbdf
Original change: https://android-review.googlesource.com/c/platform/build/+/2035323

Change-Id: I56ab0dda40d6c9325312299930423f448ad8e67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:50:52 +00:00
Cole Faust
5303c98614 Support m product-graph in Starlark product config am: 0472730380
Original change: https://android-review.googlesource.com/c/platform/build/+/2002321

Change-Id: I016f906bfb07832b40a8470b03733ba02fda3b3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:50:48 +00:00
Albert Martin
d94a8982fd Add flag to globally override updateable apexes' min_sdk_version
Override all mainline updateable apexes' min_sdk_version to same version to get a single shared native lib version on DCLA.

Test: Run "vendor/google/build/go/mainline_go_modules_arm.sh" and inspect built apexes
Bug: 212609891
Change-Id: I8edf09ca3c91ee52e9c2138c71d9b155b4448f66
Merged-In: I8edf09ca3c91ee52e9c2138c71d9b155b4448f66
2022-04-08 17:45:43 +00:00
Treehugger Robot
7b51e8cbdf Merge changes from topic "colefaust_artifact_path_requirements"
* changes:
  Add artifact path requirement support to Starlark
  Support `m product-graph` in Starlark product config
2022-04-08 17:32:25 +00:00
Yuntao Xu
990145b2ad Merge "Make file list by partitions for all lunch targets" am: 722d0a602a
Original change: https://android-review.googlesource.com/c/platform/build/+/2034494

Change-Id: I93227a42219b8b95ee61fc65cc4fd012495d6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 15:50:22 +00:00
Yuntao Xu
722d0a602a Merge "Make file list by partitions for all lunch targets" 2022-04-08 15:29:15 +00:00
SzuWei Lin
f1d3b2638b Merge "Support building EROFS for GSI targets" am: 36fc586e07
Original change: https://android-review.googlesource.com/c/platform/build/+/2052705

Change-Id: Ie8252d86ba3e883defdfe7867cc203cbc7318d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 09:12:19 +00:00
SzuWei Lin
36fc586e07 Merge "Support building EROFS for GSI targets" 2022-04-08 08:43:01 +00:00
Bob Badour
3a0f0c157e Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: Ia7cddef9748f6c036a2fc7539dad717ebc131f7c
2022-04-07 22:03:29 -07:00
Yihan Dong
9bac086900 Merge "Add additional license dependencies for VTS" am: 6d88026ef5
Original change: https://android-review.googlesource.com/c/platform/build/+/2043034

Change-Id: Ie5e3488ec7ea16cb60c4a11984f918a99beeb1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:11:10 +00:00
Bill Yi
9d994cd06b Merge SP2A.220405.004 to aosp-master - DO NOT MERGE
Merged-In: Ifba8d5912e2c39f2b403c829d44fa6d09468138d
Merged-In: Icf93f9597f78033049785cd2d2fe37d835c19b31
Change-Id: I7b4f130d0246e83d82ef6c100318a7684ef5642a
2022-04-08 02:03:17 +00:00
Yihan Dong
6d88026ef5 Merge "Add additional license dependencies for VTS" 2022-04-08 01:26:05 +00:00
Cole Faust
2af278f1a1 Merge "Add mksort implementation" am: 475b885ad3
Original change: https://android-review.googlesource.com/c/platform/build/+/2056828

Change-Id: I27352af07c39988b8533b190abfc3f674b5febb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 23:09:49 +00:00
Cole Faust
475b885ad3 Merge "Add mksort implementation" 2022-04-07 21:59:00 +00:00
Yuntao Xu
c21dc3c8c1 Make file list by partitions for all lunch targets
1. Filtered out the Android.mk file if the Make modules on them are
   not in the PRODUCT_PACKAGES or the correspoding deps;
2. Merged the Android.mk file list by partitions for all lunch targets.

Bug: 225256154
Test: lunch aosp_coral-eng; m
out/target/product/coral/mk2bp_remaining.html
Test: python3 build/make/tools/mk2bp_partition.py

Change-Id: I40919e81ab3c6bd516379f0acd72932e8db50088
2022-04-07 11:01:19 -07:00
Cole Faust
971ef8ecd6 Fix "posix_spawn: Argument list too long" issue
The shell command was too long when it listed all the make variables.
Dump them to a file instead.

Fixes: 228347189
Test: RBC_BOARD_CONFIG=1 m nothing on aosp_arm64
Change-Id: I325c78810f5efbe87df2c3ffc269ed78db8c3732
2022-04-07 10:19:21 -07:00
SzuWei Lin
0c791bedb4 Support building EROFS for GSI targets
The EROFS is planned to replace the ext4 as the file system format
of readonly partitions. This patch is enabling the ability to
build GSI with EROFS. The usage is

  $ GSI_FILE_SYSTEM_TYPE=erofs make -j

Bug: 227552340
Test: lunch gsi_arm64-user; GSI_FILE_SYSTEM_TYPE=erofs make -j
Test: Verify the file system format of system.img
Change-Id: Ie815002c677d099c4db0ab7ca22db16ac6123659
2022-04-07 07:11:24 +00:00
Colin Cross
9bb87d3f51 Merge "Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""" am: d8cf9a5a30
Original change: https://android-review.googlesource.com/c/platform/build/+/2056437

Change-Id: Ifba8d5912e2c39f2b403c829d44fa6d09468138d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:06:22 +00:00
Colin Cross
d8cf9a5a30 Merge "Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""" 2022-04-06 18:20:43 +00:00
Colin Cross
ac7febc9c7 Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""
This reverts commit 59ecb9e016.

Reason for revert: symbols_map is fixed to ignore non-elf files

Bug: 218888599
Change-Id: I88654b2dba3dfb9ab2809b0555544277279f345d
2022-04-06 01:11:20 +00:00
Cole Faust
2e8bb7989e Add artifact path requirement support to Starlark
Artifact path requirements requires setting some new variables,
and also dumping the state of the product config variables
after evaluating partial products that set artifact path requirements.

Bug: 188079133
Test: Removed the code that disabled artifacts path requirements from the rbc dashboard script,
      and verified that it was still green for aosp_arm64
Change-Id: I228e35285d788f4c83aa695c0f28b7c7db02544c
2022-04-05 16:53:38 -07:00
Cole Faust
0472730380 Support m product-graph in Starlark product config
Bug: 221312856
Test: Manually
Change-Id: Ia3a78df2de356801c83b1ba5c17601acfc026d06
2022-04-05 16:52:23 -07:00
Cole Faust
2491ad52c1 Add mksort implementation
Bug: 218736658
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I0069e7059453c16d299cc650f56c320d905f1958
2022-04-05 16:36:27 -07:00
Treehugger Robot
e7951493a1 Merge "Fix single value variable inheritance order" am: 52233be25c
Original change: https://android-review.googlesource.com/c/platform/build/+/2054306

Change-Id: I85c48e5a65f29de320e3da046f83acea2a1654cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 21:59:18 +00:00
Treehugger Robot
52233be25c Merge "Fix single value variable inheritance order" 2022-04-05 21:34:26 +00:00
Colin Cross
e662f2e4db Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" am: cba35df61b
Original change: https://android-review.googlesource.com/c/platform/build/+/2055033

Change-Id: I28b3b2e9de7f5ec04abfb52a51e8971e4c569859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 19:56:30 +00:00
Treehugger Robot
83cd363614 Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c36a
Original change: https://android-review.googlesource.com/c/platform/build/+/2055109

Change-Id: I654dd587a07486f03d8ab1aa761c1f972e3fada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 19:47:47 +00:00
Colin Cross
cba35df61b Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" 2022-04-05 17:53:24 +00:00
Colin Cross
59ecb9e016 Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"
This reverts commit 3570b3ed86.

Reason for revert: b/228195288

Bug: 218888599
Change-Id: I17b38ca1b6f8940d682f2782515bfd5f8db1ce58
2022-04-05 17:47:27 +00:00
Treehugger Robot
54dbc8c36a Merge "prevent unintended m bp2build "" when running b" 2022-04-05 17:45:08 +00:00
Sam Delmerico
b6fe473734 change logtags dependency to provide java sources
This rule originally used an android_library because it needed access to
SDK methods, but we can instead just provide Java sources and expect the
dependee to link the SDK methods.

Test: enabled QuickSearchBox and build
Change-Id: I7f1cdbea49e100ecc0944f8caa39683fb73016fb
2022-04-05 16:06:46 +00:00
Trevor Radcliffe
0eaf156a31 Merge "Make changes to support test_suites for test lib" am: f190db2a0c
Original change: https://android-review.googlesource.com/c/platform/build/+/2051889

Change-Id: I49ddf54d1edbd5a921da6df6060988f2126159cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 15:54:59 +00:00
Trevor Radcliffe
f190db2a0c Merge "Make changes to support test_suites for test lib" 2022-04-05 15:34:53 +00:00