Commit graph

62252 commits

Author SHA1 Message Date
Treehugger Robot
81718c7af9 Merge "use CommonAttributes for Tags in protos filegroups" am: dd33a493fb am: 1833a022c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310794

Change-Id: I0cba674c0a56fe8e76d5a9050d3d9d5e19dd02e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 16:21:01 +00:00
Treehugger Robot
3485722b83 Merge "Pass "-Xgc:CMC" to dex2oat when userfaultfd GC is enabled." am: 657ee23d83 am: 20ab2b8636
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2304271

Change-Id: Ic0533680f0ed3de471ead7b12c46f9441093a4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 16:20:21 +00:00
Treehugger Robot
1833a022c9 Merge "use CommonAttributes for Tags in protos filegroups" am: dd33a493fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310794

Change-Id: I93cef34ebedd9d23f6b0d7b02d3530c2acce70ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 15:53:47 +00:00
Treehugger Robot
20ab2b8636 Merge "Pass "-Xgc:CMC" to dex2oat when userfaultfd GC is enabled." am: 657ee23d83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2304271

Change-Id: Ib3faede3e50c2196c7ad6aa3c7f8cf5b6791659b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 15:53:26 +00:00
Treehugger Robot
dd33a493fb Merge "use CommonAttributes for Tags in protos filegroups" 2022-11-22 15:46:59 +00:00
Treehugger Robot
657ee23d83 Merge "Pass "-Xgc:CMC" to dex2oat when userfaultfd GC is enabled." 2022-11-22 15:10:20 +00:00
Spandan Das
d7891842ad Add jarjar's deps to bp2build allowlist am: 6960ac12ac am: 1251969d6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310383

Change-Id: I438970232a8e15802c509c973ab15b457011c3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 11:07:38 +00:00
Spandan Das
1251969d6d Add jarjar's deps to bp2build allowlist am: 6960ac12ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310383

Change-Id: Ifa254bc6a785479f98a92d4a2d409c6c71ccfbf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 10:40:51 +00:00
Spandan Das
6960ac12ac Add jarjar's deps to bp2build allowlist
jarjar switched its deps from prebuilts to source (aosp/2305413). Add
the source directory to the allowlist. This should fix broken bp2build
presubmits

Test: b build //external/jarjar
Change-Id: Ic7f37ea0ac167dc3b0f605ca0e67f8740652e0b1
2022-11-22 04:58:06 +00:00
Nikita Ioffe
0d66bddc84 Merge "Propagate stub_only_libs to the invocation generating stub sources" am: 663e060c64 am: d497e25c63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309271

Change-Id: Iaa4fdec87e0c1516f828a173eea2ed852ad36305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 23:55:53 +00:00
Nikita Ioffe
d497e25c63 Merge "Propagate stub_only_libs to the invocation generating stub sources" am: 663e060c64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309271

Change-Id: Ia739ae43736eb5ceffd53bf7dcf36c87b4c48567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 23:29:52 +00:00
Nikita Ioffe
663e060c64 Merge "Propagate stub_only_libs to the invocation generating stub sources" 2022-11-21 22:55:46 +00:00
Sam Delmerico
e9b33f70ae use CommonAttributes for Tags in protos filegroups
The Tags attribute is now available in CommonAttributes, and if we use
that one, we won't get errors with conflicting definitions of the
attribute if a global Tags value is added via CommonAttributes.

Test: m bp2build
Change-Id: I422ed817b84e6808ef60fe3599fe84332bc51d8e
2022-11-21 16:25:20 -05:00
Jihoon Kang
fc852fc1a4 Merge "Add java/fuzz_test.go to test sources" am: f33d92603e am: 8602f594e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307481

Change-Id: Id0c59ce44ae206b91ca27247ee2f31afaae19705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 20:11:01 +00:00
Jihoon Kang
8602f594e8 Merge "Add java/fuzz_test.go to test sources" am: f33d92603e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307481

Change-Id: I42429b137b821782cb6b3e0ed14e444779a6ecc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:43:59 +00:00
Jihoon Kang
f33d92603e Merge "Add java/fuzz_test.go to test sources" 2022-11-21 19:29:58 +00:00
Jihoon Kang
8eb01c38e3 Merge "Update java_api_library prop name" am: ba36441424 am: b69a83a756
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307482

Change-Id: I8aec337a896e95c4015eb7c594712935ab34aaa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 18:52:05 +00:00
Jihoon Kang
b69a83a756 Merge "Update java_api_library prop name" am: ba36441424
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307482

Change-Id: I1fcd6f8165d3f33143cc938979ab1cf45f54af6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 18:25:07 +00:00
Matt Gilbride
fe18489ada Merge "lint: always run module specified in ANDROID_LINT_CHECK_EXTRA_MODULES" am: 0e2c2aaa60 am: 6f1be6363e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309886

Change-Id: Ia4ec5cc05cea9cdad94ae8ea0b5a2e45038aaf4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 18:22:29 +00:00
Paul Duffin
7e6afb8759 Merge "Revert "Improve error reporting when depending on prebuilt implementation jar"" am: 6fcb32258a am: e32be9356e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309604

Change-Id: Ifc68fece37e9137a85d690b181912f3d3c4d2de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 18:22:17 +00:00
Jihoon Kang
ba36441424 Merge "Update java_api_library prop name" 2022-11-21 18:03:12 +00:00
Matt Gilbride
6f1be6363e Merge "lint: always run module specified in ANDROID_LINT_CHECK_EXTRA_MODULES" am: 0e2c2aaa60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309886

Change-Id: Ie2785e1a47565be4f8ec324380038cdab712b59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 17:57:40 +00:00
Paul Duffin
e32be9356e Merge "Revert "Improve error reporting when depending on prebuilt implementation jar"" am: 6fcb32258a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309604

Change-Id: I13ec42b9133ce5bb10e19847d49a1bcec3db7b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 17:57:20 +00:00
Matt Gilbride
0e2c2aaa60 Merge "lint: always run module specified in ANDROID_LINT_CHECK_EXTRA_MODULES" 2022-11-21 17:38:21 +00:00
Paul Duffin
6fcb32258a Merge "Revert "Improve error reporting when depending on prebuilt implementation jar"" 2022-11-21 17:20:03 +00:00
Treehugger Robot
f0c4992b69 Merge "Use missing.x509.pem instead of missing.pem for faked missing certificates" am: 91831b3e7c am: d793fa2104
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309251

Change-Id: I11d50d1efdc7a8cf93c144da1e6951e0d704b1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 17:01:12 +00:00
Treehugger Robot
d793fa2104 Merge "Use missing.x509.pem instead of missing.pem for faked missing certificates" am: 91831b3e7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309251

Change-Id: If4e7dcb735f9dce79722bc93c02d53cec581f102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 16:34:45 +00:00
Treehugger Robot
91831b3e7c Merge "Use missing.x509.pem instead of missing.pem for faked missing certificates" 2022-11-21 16:04:40 +00:00
Nikita Ioffe
d732da7251 Propagate stub_only_libs to the invocation generating stub sources
In some cases the java_sdk_library needs to compile against hidden
platform APIs, in order to do so it needs to add impl_only_libs
dependency on the framework library, and set the sdk_version property to
the "core_*" one (e.g. core_platform).

However, if this java_sdk_library depends on the Android SDK in it's
stable API surface, then the setup above will break the stubs srcs
generation, as it uses the sdk_version of the java_sdk_library (e.g.
core_platform), which doesn't have symbols from the Android SDK.

This chage solves the problem by propagating the stub_only_libs to the
invocation that generates the stub sources. It allows the
java_sdk_libraries to add a stub_only_libs dependency on the
android_module_lib_stubs_current stubs library to fix their stubs build.

For more context see another change in this topic:
https://android-review.git.corp.google.com/c/platform/packages/modules/Virtualization/+/2310569

Bug: 243512044
Test: builds
Test: m nothing
Change-Id: Id745cfb2789901672561050c1c3f8bb163922379
2022-11-21 15:51:40 +00:00
Martin Geisler
7b652dfd44 Merge "rust: expand docstrings for Rust module types" am: a512bb53ad am: a2ce0d3590
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309186

Change-Id: I14dc8959fce54b940044d2fe919c419324e4cbcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 11:31:05 +00:00
Martin Geisler
4b7b813b2e Merge "rust: Test with full Rust “crate_type”" am: 3e9a5d9e2f am: 3c2d8d37dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307783

Change-Id: I7ef930e63334b120cf7db74e37ce138729b45f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 11:30:45 +00:00
Martin Geisler
a2ce0d3590 Merge "rust: expand docstrings for Rust module types" am: a512bb53ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309186

Change-Id: Ica2a9cbd1865af7d2ff50dc1e28273115c2fc757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 11:05:13 +00:00
Martin Geisler
3c2d8d37dd Merge "rust: Test with full Rust “crate_type”" am: 3e9a5d9e2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307783

Change-Id: I9b7548aac9bb1dec48bc215f9260e92d8dd6e607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 11:04:48 +00:00
Paul Duffin
7ed6ff8c76 Revert "Improve error reporting when depending on prebuilt implementation jar"
This reverts commit c61783b20d.

Bug: 257969510
Reason for revert: b/255275437 - breaks checkbuild target

Change-Id: I01f88053cc24dbc1a4eb5c009f15473bdff3d565
2022-11-21 10:57:30 +00:00
Martin Geisler
a512bb53ad Merge "rust: expand docstrings for Rust module types" 2022-11-21 10:33:56 +00:00
Martin Geisler
3e9a5d9e2f Merge "rust: Test with full Rust “crate_type”" 2022-11-21 10:29:42 +00:00
Martin Geisler
4f647990ec Merge "rust: Fix indentation, convert to TABs" am: 3e0efc52f3 am: 5445943cd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307782

Change-Id: Id74168aa5657e9e4cf7cfd3b130bd76bfcf4f65b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 09:42:58 +00:00
Martin Geisler
5445943cd9 Merge "rust: Fix indentation, convert to TABs" am: 3e0efc52f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307782

Change-Id: I51d9eed40cf9f0f1cd3f9d9ed6638dea714dd5cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 09:17:13 +00:00
Martin Geisler
3e0efc52f3 Merge "rust: Fix indentation, convert to TABs" 2022-11-21 08:36:33 +00:00
Colin Cross
a54f4b5262 Use missing.x509.pem instead of missing.pem for faked missing certificates
sign_target_files_apks and check_target_files_signatures require that
certificates have a .x509.pem extension and reject missing.pem.  Using
missing.x509.pem instead.

Bug: 259861670
Change-Id: I0b2367213a8cbe390c231a8609bb04df2b125eda
2022-11-21 04:35:55 +00:00
Usta (Tsering) Shrestha
9f639521e0 Merge "ShouldKeepExistingBuldFileForDir look up by dir" am: 1ad62c7073 am: 5daaffb9db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301544

Change-Id: I89fe23c1923093498d53147b9242a3c980a39474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-19 04:44:18 +00:00
Usta (Tsering) Shrestha
5daaffb9db Merge "ShouldKeepExistingBuldFileForDir look up by dir" am: 1ad62c7073
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301544

Change-Id: I940429ea17ad35a284fed5764143b5705add19b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-19 04:18:21 +00:00
Usta (Tsering) Shrestha
1ad62c7073 Merge "ShouldKeepExistingBuldFileForDir look up by dir" 2022-11-19 03:55:46 +00:00
Jihoon Kang
60d4a09cb5 Update java_api_library prop name
Context
- Update java_api_library module's prop name from api_providers to
  api_contributions to adjust to module rename
- Update variables name correspondingly to enhance readability

Test: m
Change-Id: I93b941a572e04bed6084109d151ba83a82715651
2022-11-19 01:03:03 +00:00
mattgilbride
e17645fe30 lint: always run module specified in ANDROID_LINT_CHECK_EXTRA_MODULES
Before this change, ANDROID_LINT_EXTRA_CHECK_MODULES was only read if
ANDROID_LINT_CHECK was also set.  This change allows an entire module of
checks to be added to lint without having to specify all of the
individuals with ANDROID_LINT_CHECK.

This is part of a workaround to run some lint checks globally, but is
useful to provide more flexibility generally.

Bug: 236558918
Test: manually tested with AndroidFrameworkLintChecker
Change-Id: I2d3ec8a997d902c9d00a577a56f4b152b10e078a
2022-11-18 20:56:05 +00:00
Martin Geisler
67ec054ad0 rust: expand docstrings for Rust module types
This gives a tiny bit of context in the documentation and allows
people to more easily map the Soong build rules to the Rust
terminology.

Bug: 254469782
Test: atest
Change-Id: Ia8fde42c15919dd03954e9ebf83022d0a569407e
2022-11-18 12:11:03 +01:00
Martin Geisler
b8a4c2cad1 rust: Test with full Rust “crate_type”
What we call “static” in Soong is called “staticlib” in Rust, see
https://doc.rust-lang.org/reference/linkage.html for details.

Bug: 254469782
Test: atest
Change-Id: I65bba511d3ce8e7e53c6a1de3e77e30568934ce7
2022-11-18 12:10:58 +01:00
Martin Geisler
bd736daba3 rust: Fix indentation, convert to TABs
The two “rust_ffi_host” modules looked different in my editor because
one was indented with TABs and the other with spaces. They now
consistently use spaces (like the other examples in this file).

Test: atest
Change-Id: I7d0cdba5978da92a1a299bb290472403d4f13462
2022-11-18 11:59:09 +01:00
Rex Hoffman
3cc5740ea1 [automerger skipped] Enable new_robolectric am: ebaac47e4e am: c07abe9ad2 am: f32579b08a -s ours
am skip reason: Merged-In If58a36b2d84804d586d9c8a773e2e739867fa987 with SHA-1 54641d2aec is already in history

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

Change-Id: I1ece721fb1be9e456d4bf2716401dbedac07423d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 07:39:19 +00:00
Rex Hoffman
f32579b08a Enable new_robolectric am: ebaac47e4e am: c07abe9ad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/20387913

Change-Id: I57f613dd82abe7fc0132572028c43a44bf00e114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 07:18:13 +00:00