Commit Graph

64386 Commits

Author SHA1 Message Date
Ioana Alexandru
18fed433ff Merge "Revert "Export non-apex variants of modules to make"" am: 54fb18d43b am: aebbc670a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497035

Change-Id: Ibbb4eeb858d50e49391ee606486f7b15a90a39f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 12:16:06 +00:00
Ioana Alexandru
aebbc670a6 Merge "Revert "Export non-apex variants of modules to make"" am: 54fb18d43b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497035

Change-Id: Ie1dc599c3fe5a342e613b3922a4cb3da7b6e8dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 11:39:11 +00:00
Ioana Alexandru
54fb18d43b Merge "Revert "Export non-apex variants of modules to make"" 2023-03-20 11:08:55 +00:00
Jingwen Chen
8ac7d7d01d Revert "Export non-apex variants of modules to make"
This reverts commit 502da3987a.

Reason for revert: b/274195633

```
In file included from out/soong/installs-aosp_cf_x86_pasan.mk:134984:
In file included from out/soong/Android-aosp_cf_x86_pasan.mk:981696:
In file included from build/make/core/soong_cc_rust_prebuilt.mk:76:
build/make/core/base_rules.mk:342: error: packages/modules/Uwb/service/uci/jni: MODULE.TARGET.SHARED_LIBRARIES.libuwb_uci_jni_rust already defined by packages/modules/Uwb/service/uci/jni.
```

Change-Id: Ic1ea6969e54c23a7d126eb0fb47ab6f2e44ee965
2023-03-20 11:05:16 +00:00
Ziwei Zhang
ab2f14bc69 Merge "Add python template for mobly tests." am: e75fcf4ddb am: bf671be40f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2471946

Change-Id: I71a863e540b18d8164a8d14fbe415ed96add2084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 03:28:46 +00:00
Ziwei Zhang
bf671be40f Merge "Add python template for mobly tests." am: e75fcf4ddb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2471946

Change-Id: I05cb13fb12a7a0e7508247e33c998b826df92fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 02:50:35 +00:00
Ziwei Zhang
e75fcf4ddb Merge "Add python template for mobly tests." 2023-03-20 02:16:04 +00:00
Treehugger Robot
19fa849f45 Merge "Remove --extra_toolchains flag from aquery runner" am: 9ba1ddd355 am: 23eadd1aab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496175

Change-Id: I8ddeb9b9846c64213a5589e78fd2c9a568177aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19 00:13:59 +00:00
Treehugger Robot
23eadd1aab Merge "Remove --extra_toolchains flag from aquery runner" am: 9ba1ddd355
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496175

Change-Id: I73361029b4aa5af64732eb7f95c2419aee66ed29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 23:31:29 +00:00
Treehugger Robot
9ba1ddd355 Merge "Remove --extra_toolchains flag from aquery runner" 2023-03-18 22:56:50 +00:00
Treehugger Robot
d6559f0ab5 Merge "Resolve metrics_proto warning" am: f4f034356e am: 02ae012585
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494676

Change-Id: Ib812f12a7c2fb831add864c0a19de12c8e1f7c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:06:51 +00:00
Treehugger Robot
02ae012585 Merge "Resolve metrics_proto warning" am: f4f034356e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494676

Change-Id: Iaf06813d13e798c601db7afd119986c4face2e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 22:29:03 +00:00
Treehugger Robot
633d047fc7 Merge "Depend on stubs via @api_surfaces" am: c887ac6a04 am: 668b760be4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494344

Change-Id: I53e79802eaeb2912d370fd56932789961d1302ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:50:09 +00:00
Treehugger Robot
e3c4f4dbd5 Merge "Create a sh_binary target for jars-to-module-info" am: 9054cfb3d8 am: a57bdbbbc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494318

Change-Id: Ic89974c10b99e8cd2e73ed0468a943cb6a79e98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:49:24 +00:00
Romain Jobredeaux
78f32e270a Merge "Exclude jdk17 from bp2build instead of jdk11" am: b1559e9901 am: 7e28dca791
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494981

Change-Id: I2924d64d1972745ceddd4a1bc9cd0c688efc680d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:49:01 +00:00
Treehugger Robot
f4f034356e Merge "Resolve metrics_proto warning" 2023-03-17 21:46:55 +00:00
Treehugger Robot
668b760be4 Merge "Depend on stubs via @api_surfaces" am: c887ac6a04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494344

Change-Id: Ibedb016f2a144e499c289919beddf87bbda525c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:14:18 +00:00
Treehugger Robot
a57bdbbbc8 Merge "Create a sh_binary target for jars-to-module-info" am: 9054cfb3d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494318

Change-Id: I05fbfa0161cd3d7841e0871a35c96a06f70f294e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:14:07 +00:00
Romain Jobredeaux
7e28dca791 Merge "Exclude jdk17 from bp2build instead of jdk11" am: b1559e9901
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494981

Change-Id: I0ab1fd45dbd5882b57a7ed5373c09e6c828cffda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:12:59 +00:00
Treehugger Robot
c887ac6a04 Merge "Depend on stubs via @api_surfaces" 2023-03-17 21:06:55 +00:00
Treehugger Robot
9054cfb3d8 Merge "Create a sh_binary target for jars-to-module-info" 2023-03-17 20:50:15 +00:00
Romain Jobredeaux
b1559e9901 Merge "Exclude jdk17 from bp2build instead of jdk11" 2023-03-17 20:43:33 +00:00
Florian Mayer
cf23e2b1d3 Merge changes Ib7d0ef98,Ifbd1e542 am: c0d209f2e5 am: cf8864e201
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485558

Change-Id: I22018b2a0f770661bf5d93ac334a1ca421fc5afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 20:15:52 +00:00
Florian Mayer
cf8864e201 Merge changes Ib7d0ef98,Ifbd1e542 am: c0d209f2e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485558

Change-Id: Icbacdece9b4a00414f7651ee51e6deb3eb6e35e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 19:40:20 +00:00
Vinh Tran
cbee4e3f2e Remove --extra_toolchains flag from aquery runner
When specifying --extra_toolchains=//prebuilts/clang/host/linux-x86:all, there is no control over the sort order of toolchains, which can result in a more generic toolchain being used rather than the most specific (and correct) toolchain.

Apparently, this flag is causing Bazel to drop some flags from CppCompile actions. This causes mixed-build's outputs different from Soong build. The mixed-build also generates different from Bazel build because we don't use the flag when using `b` to build the targets.

Test: Inspect differences in CppCompile actions from Soong's Bazel aquery handler and b aquery
Bug: 273995121
Change-Id: Id9e32c0cd12ab8577cd5b223ca9e19c982f3ae1f
2023-03-17 15:34:37 -04:00
Florian Mayer
c0d209f2e5 Merge changes Ib7d0ef98,Ifbd1e542
* changes:
  Re-enable stack frame size errors
  Increase BB to explore for reachability analysis
2023-03-17 18:51:17 +00:00
Alix Espino
8d2b140206 Merge "Create helper function for BazelTargetModuleProperties in java/android" am: 2eb2ecfec0 am: bc5cacedf5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494323

Change-Id: I9da19a4fd048e6e5da36b05ffdfb9aa5406a957a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:29:05 +00:00
Cole Faust
59a02182c0 Merge "Export non-apex variants of modules to make" am: bebe607db4 am: 09f4a08f55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486355

Change-Id: Ia1e8962fe04053aadf53c528f0dce5c09d680b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:27:57 +00:00
Alix Espino
bc5cacedf5 Merge "Create helper function for BazelTargetModuleProperties in java/android" am: 2eb2ecfec0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494323

Change-Id: I5dab67f4e83d9ad7663f59ea4bfdbcd3968bfe39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 17:52:11 +00:00
Cole Faust
09f4a08f55 Merge "Export non-apex variants of modules to make" am: bebe607db4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486355

Change-Id: I0a6aa0332702b24c33e9db5ac85002781ba1bfa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 17:49:21 +00:00
Alix Espino
2eb2ecfec0 Merge "Create helper function for BazelTargetModuleProperties in java/android" 2023-03-17 17:43:39 +00:00
Cole Faust
bebe607db4 Merge "Export non-apex variants of modules to make" 2023-03-17 17:20:19 +00:00
Spandan Das
2518c022d1 Depend on stubs via @api_surfaces
BUILD files of rdeps should depend on stubs via @api_surfaces
indirection. e.g. instead of depending on
//system/logging/liblog:liblog_stub_libs_current, it should depend on
@api_surfaces//module-libapi/current:liblog. This ensures that the
generated BUILD files are compatible with Multi-tree.

Update the unit tests for this change.

Test: TH
Change-Id: Ibcc36dcfbee7b1973b341485f015e67987564dcc
2023-03-17 16:54:53 +00:00
Usta (Tsering) Shrestha
634611421a Merge "python aprotoc instead of jq and textproto" am: 9741785c4c am: 631c5289cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435092

Change-Id: I09ad8d53e1899aced03f8032de068218018cb9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:19:55 +00:00
Sam Delmerico
e77830c49d Merge "bp2build allowlist libimapper, bufferpools deps" am: 9ac38d7e4e am: f69d879621
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494315

Change-Id: I54c3c38132775c886465f0a39ead27dbd7efcdc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:18:49 +00:00
Romain Jobredeaux
d4e1a1569e Exclude jdk17 from bp2build instead of jdk11
This is part of the changes needed to switch to jdk17 as the default.

Test: presubmits
Bug: 215230098
Change-Id: I4dad9f576c88bdc98f329a35fb8a1eb1527b1366
2023-03-17 11:06:02 -04:00
Romain Jobredeaux
6d8716c176 Create a sh_binary target for jars-to-module-info
This will enable its bp2build conversion, and is needed for java_system_modules support in Bazel

Change-Id: I4f3ff5e36c8cd7f78efbb42f641efb2f76a8b71d
Bug: 215230098
2023-03-17 14:58:08 +00:00
Usta (Tsering) Shrestha
631c5289cc Merge "python aprotoc instead of jq and textproto" am: 9741785c4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435092

Change-Id: Id3ff5803b910608baac97ebc4d2fa34093bfd54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 14:43:26 +00:00
Sam Delmerico
f69d879621 Merge "bp2build allowlist libimapper, bufferpools deps" am: 9ac38d7e4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494315

Change-Id: I22fc6b2f2e03163640fc00af825203dab7f75277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 14:42:46 +00:00
Usta (Tsering) Shrestha
9741785c4c Merge "python aprotoc instead of jq and textproto" 2023-03-17 14:13:18 +00:00
Sam Delmerico
9ac38d7e4e Merge "bp2build allowlist libimapper, bufferpools deps" 2023-03-17 14:07:29 +00:00
Romain Jobredeaux
2552659d92 Merge "Create an intermediate java library for every java_binary target" am: d3d2be2636 am: e9cee4bcf0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494319

Change-Id: Ic2127af15ebb65de368fb84d09e1aae31fe4e0b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 13:46:39 +00:00
Romain Jobredeaux
e9cee4bcf0 Merge "Create an intermediate java library for every java_binary target" am: d3d2be2636
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494319

Change-Id: I88f4ddba038ce33c54d58ebf97792d12726dae3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 13:11:50 +00:00
Romain Jobredeaux
d3d2be2636 Merge "Create an intermediate java library for every java_binary target" 2023-03-17 12:30:15 +00:00
Jingwen Chen
98661ab60b Merge "Populate apexBundle#filesInfo using bazel info." am: bb37c196a3 am: 21a852f8df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486498

Change-Id: Ic2111a181cc2470f5daf6a2afad48238475c0dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:51:12 +00:00
Jingwen Chen
21a852f8df Merge "Populate apexBundle#filesInfo using bazel info." am: bb37c196a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486498

Change-Id: Ibc552d07ee2f910884111fd9daa5d48662e80ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:16:10 +00:00
Jingwen Chen
bb37c196a3 Merge "Populate apexBundle#filesInfo using bazel info." 2023-03-17 06:42:04 +00:00
Wei Li
1db5a5b00e Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." am: b67dbb23c5 am: 478895321f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494280

Change-Id: Iba276bf96fbf0bb19d0b2ee84c215cc3a7a3ba4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 06:39:00 +00:00
Wei Li
478895321f Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." am: b67dbb23c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494280

Change-Id: I70a5da21fcf58fd6e28c0f905102166b4cb9eeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 06:03:29 +00:00
Wei Li
b67dbb23c5 Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." 2023-03-17 05:24:56 +00:00