Commit graph

5646 commits

Author SHA1 Message Date
Jingwen Chen
a1a17759e1 Fix bp2build breakage by denylisting //system/apex/libs/libapexsupport/...
Added in
https://android-review.git.corp.google.com/c/platform/system/apex/+/2623829/,
but the modules depend on rust_* modules.

Test: bp2build-incremental presubmit
Change-Id: I229a2442e1b8a89ab768b54dfa713a8b97908436
2023-06-15 11:07:39 +00:00
Jason Wu
6e2d59f295 Merge "denylist logcat to pass bp2build-incremental" 2023-06-14 21:42:14 +00:00
Jason Wu
5d5a3bb963 denylist logcat to pass bp2build-incremental
Bug: 286488545
Test: bp2build.sh
Change-Id: I0940b833c6bf4f9f3780293684a6c64c0c72e32f
2023-06-14 13:26:35 -04:00
Vinh Tran
21bfa5816d Revert "Revert "Revert "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp"""
This reverts commit e3e7711ac6.

Reason for revert: CI fixed

Change-Id: Ib038241eae5ec6af78ac24105c891db55a4d0544
2023-06-14 12:24:17 +00:00
Jason Wu
ee51c54888 denylist new modules that have implicit proto deps
Bug: 286488545
Test: bp2build.sh
Change-Id: I44c5d4a407aff2cb3123b5ba7e0f0faca5bb2abc
2023-06-13 15:44:44 -04:00
Sam Delmerico
96c1550ddf disable new modules in //art/runtime
Change-Id: Idecab7b34ef4a03870ce88c314fceaa1aa597338
2023-06-13 09:16:18 -04:00
Sam Delmerico
a8a1086c87 denylist new modules that have implicit proto deps
Bug: 286488545
Bug: 246997908
Test: b build //external/protobuf/...
Change-Id: I5338e7d30b68b8e35957189f45933008216e9331
2023-06-12 14:37:56 -04:00
Treehugger Robot
01f8784246 Merge "Read BUILD files in bp2build" 2023-06-09 22:42:39 +00:00
Cole Faust
466975575b Merge "Remove --noexperimental_platform_in_output_dir" 2023-06-09 19:25:15 +00:00
Chris Parsons
8152a94816 Read BUILD files in bp2build
The parsed BUILD files will be scanned for obvious definitions of BUILD
targets which have Android.bp counterparts. In such cases, bp2build will
automatically omit conversion of these defined modules (to prevent
collisions). With this change, we no longer need one-off denylisting of
modules which have BUILD file definitions.

This has a 0.03s to 0.2s slowdown for bp2build with current state. This
impact is identical on a heavier test branch, as well. I also ran an
experiment that applied BUILD scanning to all source BUILD files
(regardless of allowlisting), and this had a 2 second slowdown.

We may want to look into parallelizing or improving the performance of
this evaluation, but it's probably not worth the effort at this time,
since the current performance hit is small.

Test: New integration test
Test: Removed libprotobuf-python from denylist and tested building the
package
Test: Treehugger

Change-Id: Ibde3bab12cd4a8fed642ad46e5344a56953bec91
2023-06-09 16:02:40 +00:00
Joe Onorato
175073c472 Make aconfig flags generate a library instead of a srcjar.
Also add unit tests for the rest of device_config

Bug: 283475679
Test: m nothing (soong unit tests)
Change-Id: Iee18a1f2f2cbb23e8c8d84c54e903b32be29a693
2023-06-09 06:16:06 -07:00
Cole Faust
319abae1c7 Remove --noexperimental_platform_in_output_dir
This is a followup to aosp/2606989.

This flag is not necessary now that we're using one platform name
for all of mixed builds.

Also rename current_product to mixed_builds_product so that it's clear
that that this platform should only be used for mixed builds.

In addition, make the bazelrc files point to the named products again
instead of the mixed build product so that b builds will still have
qualified outputs, but mixed builds won't.

Test: Presubmit and kernel build tools abtd run
Change-Id: I7f764cf42cd1323f4b495d1320931f59a076ac63
2023-06-08 17:58:35 -07:00
Cole Faust
f1815ea326 Merge "Allowlist build_image and its dependencies" 2023-06-09 00:29:27 +00:00
Treehugger Robot
f253d23e95 Merge changes from topic "cc_stem"
* changes:
  Remove modules from denylist
  Update runpath for jni libs
  bp2build support for stem
2023-06-08 22:38:34 +00:00
Cole Faust
17cd19c040 Allowlist build_image and its dependencies
Bug: 265127181
Test: Presubmits
Change-Id: Idd8508cd2ca549c75d918635b7eef36c8edd2ba0
2023-06-08 12:26:42 -07:00
Treehugger Robot
ca69a6fc21 Merge "Revert "Remove --noexperimental_platform_in_output_dir"" 2023-06-08 12:10:14 +00:00
Matthias Männich
08ccec7c11 Revert "Remove --noexperimental_platform_in_output_dir"
This reverts commit 24af24e0f2.

Reason for revert: Breaks kernel build tools build https://ci.android.com/builds/branches/aosp_kernel-build-tools/grid?head=10282004&tail=10282004

Change-Id: I486d7f305d44cfecc51a0e039cc41c0afa6495f3
2023-06-08 08:19:14 +00:00
Treehugger Robot
731c4525ca Merge "Remove --noexperimental_platform_in_output_dir" 2023-06-08 06:08:14 +00:00
Treehugger Robot
923f1fd3e2 Merge changes Ia67986af,I79da6b75
* changes:
  Mixed builds support for prebuilt_* targets
  Create GetPrebuiltFileInfo to Mixed builds cquery api
2023-06-08 02:05:57 +00:00
Spandan Das
bd1568178b Create GetPrebuiltFileInfo to Mixed builds cquery api
prebuilt_file Bazel targets do not have any build actions per se, but
return a PrebuiltFileInfo provider that determines installation rules.
To integrate this info into mixed builds, add a `GetPrebuiltFileInfo` method to
the API.

Bug: 280094612
Test: unit tests for prebuilt_etc in the next CL of this stack
Change-Id: I79da6b75b6a6cbd30869860d3620aeda731ea36a
2023-06-07 22:08:30 +00:00
Cole Faust
24af24e0f2 Remove --noexperimental_platform_in_output_dir
This is a followup to aosp/2606989.

This flag is not necessary now that we're using one platform name
for all of mixed builds.

Also rename current_product to mixed_builds_product so that it's clear
that that this platform should only be used for mixed builds.

In addition, make the bazelrc files point to the named products again
instead of the mixed build product so that b builds will still have
qualified outputs, but mixed builds won't.

Test: Presubmit
Change-Id: I5acbd18869589f67efb0ad3ebfda2c4d5a6a3850
2023-06-07 11:08:44 -07:00
Jihoon Kang
c44be96f06 Allowlist process-compat-config module
process-compat-config module is required as executable tool to create
actions for platform_compat_config rule class. Thus, add
process-compat-config Soong module to be always converted to bazel
target.

Test: TH
Bug: 269202028
Change-Id: Ic60ace1a86f3a97927937ee0e2e7385fab756deb
2023-06-06 19:36:01 +00:00
Jihoon Kang
4190764669 Merge changes from topic "android_stubs_current_refactor"
* changes:
  Cleanup android.JavaApiLibraryName references
  Redefine core and core platform API surface java_library
  Introduce product variable Build_from_text_stub
  Introduce "Exclude_static_libs" property for Java modules
2023-06-06 19:16:25 +00:00
Yu Liu
3b343c6c25 Merge "Allowtlist some cc_test modules." 2023-06-06 18:22:40 +00:00
Yu Liu
95c78ef99f Merge "Add the DCLA libs used by swcodec to the staging list" 2023-06-06 17:41:18 +00:00
Treehugger Robot
aefd27fce6 Merge "Correct genrule path references" 2023-06-06 14:59:16 +00:00
Spandan Das
cd4d085c3a Remove modules from denylist
That were blocked on `stem` conversion

Bug: 240563612
Test: TH
Change-Id: Idc0f495683d98e00ae913664eb29c9d1133720ae
2023-06-06 00:07:40 +00:00
Yu Liu
7301fc8aeb Add the DCLA libs used by swcodec to the staging list
Bug: 269342245
Test: run dcla_apex_comparison_test
Change-Id: I26bcbf6447b9216258c18c42e80f729e5651658a
2023-06-05 16:47:34 -07:00
Yu Liu
2c0b890bb2 Allowtlist some cc_test modules.
Bug: 284287101
Test: b test locally
Change-Id: I0ecd88def0f7f5e68cf48e9766575ec5dd82b7be
2023-06-05 16:40:59 -07:00
Steven Moreland
15a74066ea Merge "Remove SepolicySplit." 2023-06-05 23:08:24 +00:00
Spandan Das
91a8820688 Merge changes from topics "xsd_config_bp2build_cc_rdeps", "xsd_config_bp2build_java_rdeps"
* changes:
  bp2build for cc libraries that use xsd_config as gen srcs
  bp2build for java libraries using xsd_config srcs
2023-06-05 22:23:37 +00:00
Jihoon Kang
91c839566e Cleanup android.JavaApiLibraryName references
This change cleans up references to android.JavaApiLibraryName() so that
rdeps link against "android_*_stubs_current" instead of
"android_*_stubs_current.from-text".

Bug: 284995489
Test: m
Change-Id: Ibdf33b15981317c43e468dbc1657229d54bbd226
2023-06-05 21:45:01 +00:00
Jihoon Kang
cbcad7c62f Introduce product variable Build_from_text_stub
Build_from_text_stub can be used to specify static lib and exclude
static lib based on build configuration.

Bug: 285410821
Test: m
Change-Id: I083f32325c7b3ab5e88c4f5cb248c00f2094fb1e
2023-06-05 21:44:07 +00:00
Jihoon Kang
381c2fa27c Introduce "Exclude_static_libs" property for Java modules
Exclude_static_libs property can be used to specify static libs that
should not be used to build the module. The list acts as filter for
static_libs.

Bug: 285410821
Test: go test ./java
Change-Id: Iee7f160ba88b5f64bdd265c30d47c9f51feb0f5e
2023-06-05 21:42:48 +00:00
Zi Wang
e71945b791 Merge "Remove truth-prebuilt and truth-host-prebuilt from denylist" 2023-06-05 20:58:35 +00:00
Liz Kammer
1e75324ebd Correct genrule path references
Test: b build `bmod robolectric_tzdata`
Test: go test bp2build tests
Change-Id: I98333f2b9f480019ddca11944b455d484a47cf8e
2023-06-02 19:09:35 -04:00
Jiakai Zhang
48203e3dee Add an allowlist for modules that have broken optional_uses_libs.
Bug: 282877248
Test: m nothing
Change-Id: I1afe9d523af0633f0428d4c15e1417db1dae4e93
2023-06-02 23:42:53 +01:00
Zi Wang
b9d36bcb6b Remove truth-prebuilt and truth-host-prebuilt from denylist
truth-prebuilt and truth-host-prebuilt are able to be
built by bazel now.

Bug:285001041

Test: presubmit
Change-Id: I49ca0c4ccd55a0df591176554eab4e82c95e4699
2023-06-02 15:29:49 -07:00
Spandan Das
82f0e5daae Merge "Always convert xsd_config module type" 2023-06-02 20:07:48 +00:00
Jiakai Zhang
f508c252bb Merge "Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES." 2023-06-02 14:59:10 +00:00
Zi Wang
4af4ff33f0 Merge "Add simple bp2build converter for java_test_host" 2023-06-01 22:37:28 +00:00
Spandan Das
370f13c3bd bp2build for java libraries using xsd_config srcs
In Soong, java libraries can use src files generated from xsd_config. In
Bazel, instead of providing srcs, java_xsd_config_library will provide a
jar. Update bp2build so that all src references to xsd_config modules in
srcs get routed to deps and exports attributes

This CL creates an interface in build/soong/android to get around a
circular dependency issue. The bp2build logic needs to exist in
soong-java, but soong-java does have soong-xsdc in its package path. Use
the interface and type assertions to special case xsd_config references

Bug: 211678537
Test: bp2build test in sibling CL in system/tools/xsdc
Change-Id: Ida924bb20b1fd7eb8beeef950b070d37a9c6f3b5
2023-06-01 19:12:12 +00:00
Spandan Das
8d6bf5e59b Always convert xsd_config module type
Modules of this type have a limited set of deps (e.g. libxml2), and they
have already been converted.

compatibility_matrix_schema is a filegroup that is used in one of the
xsd_config modules in Soong, and it has been added to the allowlist as
well.

Test: bp2build.sh
Bug: 211678537
Change-Id: Idcbafe7c8413134b9dd7abb0dee53473f3e1d2e8
2023-06-01 19:12:05 +00:00
Zi Wang
65b36729c3 Add simple bp2build converter for java_test_host
Bug:281551424

Test: java_test_host_conversion_test.go and presubmits
Change-Id: I43ed26df0bacd63ef402de4d9733d19604005c35
2023-06-01 10:37:09 -07:00
Jiakai Zhang
4f65a03d30 Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES.
Bug: 282877248
Test: Presubmit build tests.
Change-Id: Idd69433f308f5f47973ff0d5340a2399a27cb32c
2023-06-01 15:21:42 +01:00
Steven Moreland
26da122d61 Remove SepolicySplit.
Obsolete.

Bug: 257176017
Test: build&boot
Change-Id: Id639ad77f12d38507ad1a2300cb392bbfeadb9e4
2023-05-31 22:00:56 +00:00
Treehugger Robot
780ea1f8d1 Merge "Create a "current_product" named platform." 2023-05-31 08:00:12 +00:00
Spandan Das
0cb8770989 Merge "Allowlist xsdc" 2023-05-30 21:05:36 +00:00
Jingwen Chen
583ab219ea Create a "current_product" named platform.
This enables output paths of product agnostic targets (e.g. mainline
apex) to be identical when switching between target products, since the
product name is no longer embedded in:

1) the output path prefix in bazel-out
2) the PlatformOptions contribution to the configuration hash as part of a transition

Test: treehugger
Change-Id: I3fd0f7134209aa7eede3ed98412a1c5482689b57
2023-05-30 15:40:18 +00:00
Kiyoung Kim
5500fc89c1 Merge "Rename build.ninja with product name" 2023-05-30 07:17:08 +00:00