Commit Graph

7613 Commits

Author SHA1 Message Date
Christopher Parsons
a07eedf390 Merge "create, but dont register, bp2build_deps mutator" into main am: 29c559b785
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768645

Change-Id: I45187628f78551bc3b6638a4563434d6dd28bb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 21:48:17 +00:00
Treehugger Robot
4f20dc378d Merge "Expand regex for likely aidl filegroups" into main am: e88fe1fb92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768335

Change-Id: Iebfd7023a546eacccdad6f7972e3ff5d6b9e6943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 21:46:59 +00:00
Christopher Parsons
29c559b785 Merge "create, but dont register, bp2build_deps mutator" into main 2023-10-04 21:38:49 +00:00
Treehugger Robot
e88fe1fb92 Merge "Expand regex for likely aidl filegroups" into main 2023-10-04 21:11:18 +00:00
Alix
141ab6adde use message in android.AssertStringMatches()
function does not currently use the message argument  passed to it.
outputting this as part of the error message would be helpful for any
failures.

Change-Id: I5307df1567e79d85f81edd5a9eb3d4a093041535
2023-10-04 20:19:54 +00:00
Liz Kammer
1f309f3ac9 Allowlist AndroidFrameworkLintChecker
Test: bp2build.sh
Bug: 299463632
Change-Id: I72def76df4f105a3496c7b2dd1588910e62d562b
2023-10-04 10:37:05 -04:00
Justin Yun
70cc2d5681 Merge "Generate product variants by default" into main am: ce12ea8f95 am: dead374d4d am: 955b380660 am: 3b5053ee1f am: 80a0b71ece
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829

Change-Id: I42d3ce7a0ead8bb799dbda7d07040dae870e6998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 09:27:43 +00:00
Justin Yun
dead374d4d Merge "Generate product variants by default" into main am: ce12ea8f95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829

Change-Id: I31046c62e08a60dbc460f3ac8393782d868d630d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 07:07:47 +00:00
Justin Yun
ce12ea8f95 Merge "Generate product variants by default" into main 2023-10-04 06:29:31 +00:00
Treehugger Robot
45df669abc Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c am: 31f5c0d738 am: 632e6360d1 am: b8246fbafe am: 2da00b660e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005

Change-Id: I62fe53f31bc5f26d513b6cfae5f9611a0ab16d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 02:44:36 +00:00
Treehugger Robot
31f5c0d738 Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005

Change-Id: I80f97088df6104a3e69846ffcf995c24b71bb1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 00:25:38 +00:00
Jihoon Kang
7ac61080b7 Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1 am: 3d1cecda28 am: 40386ed37e am: f9503e962b am: 2e660fdb2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

Change-Id: I13de5bcfee96d188c68442bda12a7fee6f737aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 20:07:40 +00:00
Spandan Das
a2db7a6446 Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d am: 063030cbb7 am: f26423b0fe am: e8cabc1be1 am: 2a5605132e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118

Change-Id: I61cbb4a7903550cd451d95c3e61a0fc2e3ada4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 20:07:20 +00:00
Yu Liu
b26082bdb6 Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45 am: 2d7db62bcc am: 60ee7d23cd am: f1212c4b0c am: 646a062b48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429

Change-Id: I923fdd52cd31620bce01564bcf45f6d03710450e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 20:07:01 +00:00
Zi Wang
860bb0c5de Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58 am: 8cae29f34c am: 066f962bb6 am: 1772066f60 am: 3b1bbe2f50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103

Change-Id: Ide36245a1df9b1fc8873dfd99b7f5ae5ec07e91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 19:19:01 +00:00
Yu Liu
b57dd3946e Remove AconfigJavaHostTest from the allowlist.
It was added by an accident previously.

Bug: None
Test: CI
Change-Id: I9a1fa32bb2686f336f9735a1e809a8491d38cd4c
2023-10-03 11:22:07 -07:00
Jihoon Kang
3d1cecda28 Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

Change-Id: Id1645b93c56654857c6d8ae551227c728ac76e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 18:02:14 +00:00
Spandan Das
063030cbb7 Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118

Change-Id: Id479359b55f4b75b92817cdeb3a5aaa4333c9c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 18:01:43 +00:00
Yu Liu
2d7db62bcc Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429

Change-Id: I298633470fbb8c41442104419b811ac59751d213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 18:01:26 +00:00
Jihoon Kang
a7e5e29ec1 Merge changes from topic "expose_flagged_api_revert" into main
* changes:
  Revert^2 "Add flagged api hide conditional to droidstubs"
  Revert^2 "Add soong config variable Release_expose_flagged_api"
2023-10-03 17:55:16 +00:00
Spandan Das
29af2a470d Merge "Handle symlinks in isPackageBoundary" into main 2023-10-03 17:51:41 +00:00
Yu Liu
7a90fcfa45 Merge "Convert java_aconfig_library to bazel." into main 2023-10-03 17:29:26 +00:00
Zi Wang
8cae29f34c Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103

Change-Id: Ib863c47261892d3cd594f3afd31475491a2def04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 17:12:01 +00:00
Zi Wang
33befd0c58 Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main 2023-10-03 16:31:29 +00:00
Jihoon Kang
c831389625 Revert^2 "Add flagged api hide conditional to droidstubs"
This reverts commit 1180919dda.

Test: go test ./java && m TARGET_PRODUCT=sdk TESTING_TARGET_RELEASE_NEXT=true nothing and inspect ninja command for generating stubs and verify the flag is included && m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_food nothing and inspect ninja command for generating stubs and verify the flag is not included
Bug: 299570421
Change-Id: I4967376c0236bad729398af80fa59b48dbab5f21
2023-10-03 01:04:00 +00:00
Jihoon Kang
f3aa3225b6 Revert^2 "Add soong config variable Release_expose_flagged_api"
This reverts commit 5548bf3053.

Test: m nothing
Bug: 299570421
Change-Id: I9f70648fb6657bbf4f5681cd6d40517d70a8fefb
2023-10-03 01:00:42 +00:00
Chris Parsons
5f1b3c7ad8 create, but dont register, bp2build_deps mutator
This is the bulk of the "allowlist v2" feature. It will disable bp2build
generation for modules which have transitive dependencies without a
bazel build definition.

This CL includes this mutator, but doesn't register it as a bp2build
mutator (outside of a few unit tests). This allows us to easily iterate
on completion of this feature and ensure there are no launch blockers
before we finalize the change in AOSP.

Bug: 285631638
Test: Unit tests
Change-Id: Ifb0a079c409ca19b02cafa3fab2efa0d3deebc50
2023-10-03 00:16:30 +00:00
Yu Liu
f2b94010c8 Convert java_aconfig_library to bazel.
Bug: 297357579
Test: Unit test and AconfigJavaHostTest
Change-Id: Icf944cc0b2a7382107923d49b2d2ff0eb4113638
2023-10-02 15:04:19 -07:00
Christopher Parsons
2afca818d2 Merge "Treat src=name filegroups as handcrafted targets" into main am: aa3e435857 am: 87fbbe641d am: dd03dde9c2 am: a9abf7e090 am: 630f53dd40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766186

Change-Id: I0dd49f2456b4216d0e64bf293c87d4ab096764f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:20:11 +00:00
Christopher Parsons
87fbbe641d Merge "Treat src=name filegroups as handcrafted targets" into main am: aa3e435857
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766186

Change-Id: Ib25d2952b0f8aca01fbe651550e1a50967e3b605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 18:35:30 +00:00
Romain Jobredeaux
b2271f3f71 Merge "Use manual BUILD files in jdk8 and allowlist apache-commons-compress" into main am: e2007bfd0e am: fc6a6fd081 am: 49b07dc069 am: 61535ddb6f am: d52f4c7d84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2767831

Change-Id: I084bd90edc435ad670debd7e503979f5ef8507f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 18:30:02 +00:00
Spandan Das
a7da3f0e0b Create bp2build converter for versioned_ndk_headers
This module type is used by a single soong module - `common_libc` in
bionic/libc

Implementation details
- Convert this module type to ndk_headers rule. Bazel's ndk_headers rule
  will have a boolean attribute `run_versioner` to determine if
  verioner should be run on the headers
- Add this module type to the alwaysConvert bp2build list
- Add the converted target for `common_libc` to the deps of
  `ndk_sysroot`. This ensures that unbundled apps link against the
  versioned NDK headers of libc

Test: go test ./bp2build
Test: b build //bionic/libc:common_libc --config=android
Test: for f in $(find bazel-bin/bionic/libc/common_libc.versioned -type f); do cmp $f ${f/bazel-bin\/bionic\/libc\/common_libc.versioned/out\/soong\/ndk\/sysroot\/usr\/include}; done # no diff

Bug: 301169067

Change-Id: I55be202f0589db9bdc743c8be41c9c5afd74c352
2023-10-02 17:35:55 +00:00
Christopher Parsons
aa3e435857 Merge "Treat src=name filegroups as handcrafted targets" into main 2023-10-02 17:35:44 +00:00
Zi Wang
2260933688 Allowlist tradefed-common-util and some dependents for tradefed
Test: CI

Bug: 283193845
Change-Id: Id9e8eefcf47080e786c62466658c7cb1f31b055d
2023-10-02 09:56:34 -07:00
Romain Jobredeaux
fc6a6fd081 Merge "Use manual BUILD files in jdk8 and allowlist apache-commons-compress" into main am: e2007bfd0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2767831

Change-Id: I39fbdd11d59b1b3905cd55ebd4146913b8e64e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 14:19:44 +00:00
Romain Jobredeaux
e2007bfd0e Merge "Use manual BUILD files in jdk8 and allowlist apache-commons-compress" into main 2023-10-02 13:38:50 +00:00
Spandan Das
dc7d7f7557 Handle symlinks in isPackageBoundary
isPackageBoundary looks at ShouldKeepExistingFile before checking if
that directory contains a BUILD file or not. ShouldKeepExistingFile
should be complemented with a isSymlink check. This is necessary because
we copy all symlinks to the synthetic workspace, and the resolved
symlink might point to a directory containing a BUILD file.

This additional clause is redundant if the directory has been
allowlisted for keepExistingBuildFile (e.g. build/bazel, recursive)

Test: b build //bionic/libc:versioner-dependencies (top of stack)

Change-Id: I5b23262f89ea34a78de4ccade6d27e4c5dd95c2e
2023-09-29 21:04:30 +00:00
Romain Jobredeaux
3fe1edde31 Use manual BUILD files in jdk8 and allowlist apache-commons-compress
Bug: 302008402
Bug: 302587886
Change-Id: I91401bf3fcda4c83ad2bb9d782b4021ffe6fd103
2023-09-29 15:08:55 -04:00
Mark White
b15dd000a9 Merge "Added new framework-pdf jar inside MediaProvider module" into main am: 477a31271d am: 14a6903e77 am: f500e9d78d am: 5c7259efb3 am: e704e4ecaf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760586

Change-Id: I3f7a71f2ef0672bc033e156602ee2dbf025b468a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 17:39:37 +00:00
Liz Kammer
79ff08f12c Expand regex for likely aidl filegroups
Test: go test soong tests
Change-Id: Iab7abea8e2d11583cb4a8ecd4b27368f61dd40e0
2023-09-29 12:38:42 -04:00
Mark White
14a6903e77 Merge "Added new framework-pdf jar inside MediaProvider module" into main am: 477a31271d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760586

Change-Id: I2ae058860ad10e700934ff3648a2d51ad81bf0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 13:26:48 +00:00
Mark White
477a31271d Merge "Added new framework-pdf jar inside MediaProvider module" into main 2023-09-29 12:21:33 +00:00
Christopher Parsons
ce883733e2 Merge "support aidl bp2build changes" into main am: dec9ce6693 am: 49ff8ddaa7 am: c56fc85760 am: eb0efe0dbf am: 02369ac604
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757771

Change-Id: I55c9c92762ff82810445b14945c5e9c3deac91d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 01:55:02 +00:00
Chris Parsons
2ef472be7a Treat src=name filegroups as handcrafted targets
This is groundwork for allowlist v2, as such targets are still
effectively referencable via their file syntax; thus, rdep targets of
these filegroups should still be treated as convertible.

Fixes: 302025822
Test: Unit test update
Change-Id: I93445ff75e7c0570530725d086e47c1532833c06
2023-09-28 23:07:00 +00:00
Christopher Parsons
49ff8ddaa7 Merge "support aidl bp2build changes" into main am: dec9ce6693
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757771

Change-Id: I95902c66e394c3cdb1d1fbe77eeb62fa2b5e1709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 21:43:33 +00:00
Cole Faust
be3b4a4483 Merge "AVB and selinux support in partitions" into main am: 6ed1e0fd59 am: 32670ab73d am: 44c777c05d am: 1162ccefbb am: ff3c17a364
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766206

Change-Id: I553fea720bf0cc55a26395bd06b0e41c022827ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 20:45:14 +00:00
Christopher Parsons
dec9ce6693 Merge "support aidl bp2build changes" into main 2023-09-28 20:19:43 +00:00
Cole Faust
32670ab73d Merge "AVB and selinux support in partitions" into main am: 6ed1e0fd59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766206

Change-Id: I8d89ca7a67dfd129bcd73b8758bb76703fc13283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 17:23:44 +00:00
Cole Faust
6ed1e0fd59 Merge "AVB and selinux support in partitions" into main 2023-09-28 16:38:28 +00:00
Jingwen Chen
1b5792eb5a Merge "Allowlist directories for tradefed's deps." into main am: 6b73be150c am: be81da7e7e am: bb3ab13a34 am: 29686a6922 am: 29b98ee513
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763425

Change-Id: I58e0f77e468b34dcf177d55849ce3042208f0b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 12:12:30 +00:00