Commit Graph

73000 Commits

Author SHA1 Message Date
Treehugger Robot
7eb6ffc796 Merge changes from topic "java-proto-include-dir" into main
* changes:
  Handle proto.include_dirs for java
  Translate python_libray.pkg_path to proto.import_prefix
2023-08-28 17:18:29 +00:00
Alix Espino
6af68b8270 Merge "support for multiple filegroups and resource_dirs" into main am: 5dbb696c53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2626338

Change-Id: I8c3500b085c3443d0a93d3f3f8c130baefa64923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 17:12:08 +00:00
Wei Li
0b2472a365 Merge "Use ninja rspfile for list of provenance metadata file of modules, in case there are many provenance metadata files and the list might exceed the command line length limit." into main am: d632171e93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726916

Change-Id: I1298e05ea700b725201d97ed588edc5edf442e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 17:11:45 +00:00
Alix Espino
5dbb696c53 Merge "support for multiple filegroups and resource_dirs" into main 2023-08-28 17:10:13 +00:00
Wei Li
d632171e93 Merge "Use ninja rspfile for list of provenance metadata file of modules, in case there are many provenance metadata files and the list might exceed the command line length limit." into main 2023-08-28 16:17:27 +00:00
Treehugger Robot
7bde15bca7 Merge "Add aconfig annotations for java_aconfig_library" into main am: 01f70e8d0e am: 82c3fafd8f am: 1fae4456e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2682307

Change-Id: Ib9769457fd28d0e444c554ee946cbbfc35f10f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 15:08:19 +00:00
Treehugger Robot
1fae4456e9 Merge "Add aconfig annotations for java_aconfig_library" into main am: 01f70e8d0e am: 82c3fafd8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2682307

Change-Id: I3ccb3182061eb5876975418fb84b225e92bb3685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 14:26:24 +00:00
Treehugger Robot
82c3fafd8f Merge "Add aconfig annotations for java_aconfig_library" into main am: 01f70e8d0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2682307

Change-Id: I1438c67f334f38cc17c75ea9cc08cddab5496171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 13:41:38 +00:00
Treehugger Robot
01f70e8d0e Merge "Add aconfig annotations for java_aconfig_library" into main 2023-08-28 13:03:56 +00:00
Ian Zerny
186bae7f2e Merge "Translate SDK level 10000 to a valid compiler min-api" into main am: f94c8113a3 am: 2d8d538c2b am: 6aa4aa6852
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727794

Change-Id: I793a072be6f916a0038a35bc8ad56020274f3a07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 08:49:49 +00:00
Ian Zerny
6aa4aa6852 Merge "Translate SDK level 10000 to a valid compiler min-api" into main am: f94c8113a3 am: 2d8d538c2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727794

Change-Id: I2a37ac576387b03cd70af6192c844d07347ef975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 08:07:28 +00:00
Ian Zerny
2d8d538c2b Merge "Translate SDK level 10000 to a valid compiler min-api" into main am: f94c8113a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727794

Change-Id: I62732250881d9bb8f1922c7afe8b93cab70559e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 07:23:06 +00:00
Ian Zerny
f94c8113a3 Merge "Translate SDK level 10000 to a valid compiler min-api" into main 2023-08-28 06:26:36 +00:00
Joe Onorato
8f75585b37 Add aconfig annotations for java_aconfig_library
Test: m
Bug: 289087078
Change-Id: I860b91f984b2f2c596360490337fb25a4df7a988
2023-08-26 08:26:18 -07:00
Vinh Tran
3162c8a71e Merge changes from topics "build-aconfig", "build-libprotobuf-for-host-only" into main am: 54a5905803 am: 6c28803c66 am: aa6e574d8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726675

Change-Id: I820b60e78b7a3bf264786fedcc28f53a53de1107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26 05:01:36 +00:00
Vinh Tran
aa6e574d8f Merge changes from topics "build-aconfig", "build-libprotobuf-for-host-only" into main am: 54a5905803 am: 6c28803c66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726675

Change-Id: I9196d149d7c34f1331cd10611016bc09fb2fa6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26 04:19:43 +00:00
Vinh Tran
6c28803c66 Merge changes from topics "build-aconfig", "build-libprotobuf-for-host-only" into main am: 54a5905803
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726675

Change-Id: Ib0f42a43a92e2b490c5a8d3ed46210d55235b0c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26 03:34:58 +00:00
Vinh Tran
54a5905803 Merge changes from topics "build-aconfig", "build-libprotobuf-for-host-only" into main
* changes:
  Allowlist aconfig
  Implement bp2build converter for rust_protobuf_host
  Implement bp2build converter for rust_binary
  Convert libprotobuf to Bazel
  Allowlist all aconfig deps modulo libprotobuf and libaconfig_protos
  Implement bp2build converter for rust_proc_macro
  Allowlist rust_library dependencies of aconfig
  Implement bp2build converter for rust_library
2023-08-26 03:17:59 +00:00
Vinh Tran
85b177dff7 Allowlist aconfig
Test: b build //build/make/tools/aconfig:aconfig
Bug: 295910295
Change-Id: Ic71b2982a715b9ea36f8bf40fc5158e6f58f6a2c
2023-08-25 18:03:43 -04:00
Vinh Tran
0c4b9ec5e0 Implement bp2build converter for rust_protobuf_host
Test: go test
Bug: 295925256
Change-Id: I43b7359da8fc19f4338e2583448b7617194df5e6
2023-08-25 18:00:33 -04:00
Vinh Tran
093a57edb2 Implement bp2build converter for rust_binary
Test: go test
Bug: 295910295
Change-Id: Ieb18d9071f28e53a0463614594cee0fd755b7b3c
2023-08-25 17:58:53 -04:00
Vinh Tran
9b84678faf Convert libprotobuf to Bazel
Since this is a one-off just for building libprotobuf that will be removed when we handle cargo output more generically (b/297364081), I didn't write a unit test for this CL.

Test: b build //external/rust/crates/protobuf:libprotobuf
Bug: 295925256
Change-Id: I00cf44d54be27a09c184a96c13b250a2e54e2d10
2023-08-25 17:53:37 -04:00
Wei Li
04e4dfa26e Use ninja rspfile for list of provenance metadata file of modules, in case there are many provenance metadata files and the list might exceed the command line length limit.
Bug: 297350341
Test: CIs & manual test
Change-Id: Iff4da6de019d62d7ce8545241b3a289cff0f33de
2023-08-25 14:52:07 -07:00
Vinh Tran
c1a6ceefd3 Allowlist all aconfig deps modulo libprotobuf and libaconfig_protos
Test: b build //external/rust/crates:all
Bug: 295903972
Change-Id: Ieb29516722155ef8921e454eaa1ea51fad99ec08
2023-08-25 17:51:54 -04:00
Vinh Tran
b4bb20f583 Implement bp2build converter for rust_proc_macro
Test: WIP
Bug: 297356482
Change-Id: I17d1a0a95d4a67ccbc9b2d74e49bcacd6ff4d26b
2023-08-25 17:50:48 -04:00
Vinh Tran
3570ce3f69 Allowlist rust_library dependencies of aconfig
These deps are not depdendent on libaconfig_protos (rust_protobuf_host) and rust_proc_macro modules.

Test: b build //external/rust/crates/...
Bug: 295910506
Change-Id: I1c6058d029c2d475bd760ae9497fe78343a13882
2023-08-25 17:45:24 -04:00
Liz Kammer
32c634bca9 Fix false pos in bp2build-prog due to prebulits
The prebuilt_ prefix was removed before writing converted modules, which
causes false positives when a prebuilt and from source module exist with
the same name but only one has been converted

Test: b run //build/bazel/scripts/bp2build_progress:bp2build_progress \
    -- report -m core-lambda-stubs-for-system-modules
Change-Id: Id00099780fb6af9fffcf745b509116a66bac8756
2023-08-25 17:42:42 -04:00
Vinh Tran
bcb5f57eed Implement bp2build converter for rust_library
Test: go test
Bug: 297294749
Change-Id: I5400fe2c0fe2097b7a5810c736fbd1de4f35c6f7
2023-08-25 17:42:13 -04:00
Xin Li
16b7e67db6 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I0a83d1213dde818cfa6a04e51ddeb2056fb7f87a
Change-Id: Ic42567470afdce778c4835f766847766f4673b01
2023-08-25 13:35:17 -07:00
Makoto Onuki
2d95eacc7e Support java_data in sh_test_host am: 1725b20d14 am: c10a2c20dd am: 45c1c8bab1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726813

Change-Id: I4bb084fe5f49c9a20e1b659b6df0b1c2ed0be285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:49:43 +00:00
Makoto Onuki
45c1c8bab1 Support java_data in sh_test_host am: 1725b20d14 am: c10a2c20dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726813

Change-Id: I8f5dc805f484408e5100c1f37f1fca6de4b4f352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:07:08 +00:00
Makoto Onuki
c10a2c20dd Support java_data in sh_test_host am: 1725b20d14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726813

Change-Id: I4251e3577dd2985f62827ec5bcaf5fe7d86ea001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 18:23:16 +00:00
Todd Lee
2ec7e1c55c Support for incremetal platform prebuilt APIs
This change provides support for prebuilt incremental platform API (i.e.
API changes associated with a QPR, as opposed to a major dessert
releas).

This feature is provided via the existing prebuilt_apis module with the
introduction of a new attribute:

    allow_incremental_platform_api

While typical platform prebuilt APIs are presumed to be under a
directory structure that follows the pattern:

<version>/<scope>/<module>.jar
<version>/<scope>/api/<module>.txt

Where <version> is limited to a single integer signifying the API level.

For modules where allow_incremental_platform_api is set to 'true' (false
by default) the pattern is the same, however <version> is presumed to be
of the form MM.m, where MM aligns with the existing API level and m
signifies the incremental release (e.g. QPR).

Bug: b/280790094
Test: platform build check with both incremental & non-incremental API
      cd build/soong && go test ./java
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eee6995093485497bc29cdce01c2a86765ffb4eb)
Change-Id: I67e293006ccfa210d0dcc0a294db894632f1b6cb
2023-08-25 18:03:44 +00:00
Ivan Lozano
5467a39984 rust: Rust sanitized snapshots variations
This adds support for correctly handling Rust sanitized snapshots,
ensuring they only have one variation.

The presence of multiple variations were causing build failures
when a rust_fuzz module for host was defined and a snapshot
build was requested.

This also sets -Z link-native-libraries=no on host modules
(in addition to device modules) to avoid emitting extra linkage
flags due to link attributes.

Bug: 282897366
Test: SOONG_SDK_SNAPSHOT_USE_SRCJAR=true m
Change-Id: Idf980c29145f11c530ad635a4eb5b01a1730ac24
2023-08-25 12:54:56 -04:00
Alix
289e9c607b support for multiple filegroups and resource_dirs
Test: tests in bp2build and b build //external/emma:emma

Change-Id: I57e60389aec926c55d01818a6a3b1ec33e9c53b8
2023-08-25 16:12:15 +00:00
Liz Kammer
01c09caac8 Allowlist more deps of adb
Test: b build //packages/modules/adb/...
Test: b build //packages/modules/adb/... --config=android
Change-Id: If007f795b0eda9d6d877de7dcb2306a7e35baed6
2023-08-25 13:44:04 +00:00
Inseob Kim
5bac3b6f2a Use board api level for seapp coredomain check
Rather than PRODUCT_SHIPPING_API_LEVEL, use board api level
(BOARD_API_LEVEL or BOARD_SHIPPING_API_LEVEL) to determine whether we
check coredomain violations or not.

Also provides a Makefile variable to override the flag, for targets that
want to turn on the check optionally.

Bug: 280547417
Test: see build command of vendor_seapp_contexts
Change-Id: Ic7c4a53d0df0cccd45eb699e236a92c8c0bc2d56
2023-08-25 21:29:56 +09:00
Ian Zerny
c26029b473 Translate SDK level 10000 to a valid compiler min-api
Targets with the special level 10000 are compiled using the current
platform SDK level. They are also compiled as a "platform build" which
will disable features such as API modeling and method backports.

Bug: 295591477
Test: manual inspection of the updated build commands
Change-Id: Ifda8859396b33dde4c46a9b212ddb855b012bf07
2023-08-25 13:48:21 +02:00
Yi Kong
ed7c73edfe Update clang version to clang-r498229b
Now built with MLGO. This reduces the total Clang invocation time for
building AOSP by 0.7%.

    TOOLCHAIN_RUSAGE_OUTPUT=/tmp/rusage.txt m -j32
    PGO + LTO + BOLT          83839.78s
    MLGO + PGO + LTO + BOLT   82949.30s

Test: presubmit
Bug: 293616148
Change-Id: I5364c341520172e8e1acafb4aa3330922805ac0e
2023-08-25 15:21:52 +09:00
Dan Willemsen
fe2dafc36b Revert "Temporarily disable python precompilation for py3.11"
This reverts commit b1094d602b.

Reason for revert: prebuilts updated in aosp/2726579

Bug: 278602456
Change-Id: I750b0f7e4dd94329a4455499f869a1823e660d77
2023-08-24 22:59:16 +00:00
Treehugger Robot
48c998cce0 Merge "Add the system image test to the bazel sandwich" into main am: 4e6c42d417 am: 4e3ee2c9a5 am: 8ded301316
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724199

Change-Id: I0094d66a04dcdd9ac3c019225cb98ded31b3b2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:52:46 +00:00
Spandan Das
04a07df099 Merge changes from topic "proto-include-dir-py" into main am: 234bb3bd8d am: ccce31bb74 am: 21933784f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721824

Change-Id: If12abe83259117ac21c11461e8c9c026f821f486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:49:10 +00:00
Makoto Onuki
1725b20d14 Support java_data in sh_test_host
Bug: 297225342
Test: with a custom test rule
Test: cd sh && go test ./...
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de5d265a798ce0e12ad0a2d0a6675942df5cd10b)
Merged-In: Ia5a60fa6d917f2c2fde56df543625024ec11877a
Change-Id: Ia5a60fa6d917f2c2fde56df543625024ec11877a
2023-08-24 22:17:56 +00:00
Treehugger Robot
8ded301316 Merge "Add the system image test to the bazel sandwich" into main am: 4e6c42d417 am: 4e3ee2c9a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724199

Change-Id: Ib41db5b779dc000236ce8dbcca04869ec1b9ab7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:10:06 +00:00
Spandan Das
21933784f2 Merge changes from topic "proto-include-dir-py" into main am: 234bb3bd8d am: ccce31bb74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721824

Change-Id: I224794aaeedd3b584d2e492b1a7383dedc200401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:09:46 +00:00
Treehugger Robot
4e3ee2c9a5 Merge "Add the system image test to the bazel sandwich" into main am: 4e6c42d417
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724199

Change-Id: Ib462d61af54b11a64bb9b5220b97dac7ce0e094b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:07:15 +00:00
Treehugger Robot
4e6c42d417 Merge "Add the system image test to the bazel sandwich" into main 2023-08-24 21:50:22 +00:00
Spandan Das
ccce31bb74 Merge changes from topic "proto-include-dir-py" into main am: 234bb3bd8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721824

Change-Id: Iec171d46c05ba9c5a2fdc47e8a63f58940a90879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 21:27:12 +00:00
Spandan Das
234bb3bd8d Merge changes from topic "proto-include-dir-py" into main
* changes:
  Handle proto.include_dirs in bp2build for py
  Add proto.local_include_dirs support in bp2build
  Add manual tag to proto_library at the root package
2023-08-24 20:57:47 +00:00
Colin Cross
d38b26abb4 Merge "Fix adding manual ubsan runtime to static glibc binaries" into main am: 55e775f94f am: 14e366fbec am: 050f23d2f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723481

Change-Id: Ib8d1ab34f9dcaf01d14d756add9ed63179c9de8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 19:29:26 +00:00