StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I09902215,I4f86780c

Browse Source 
* changes:
  convert java_plugin with bp2build
  convert java static dependencies
This commit is contained in:
Sam Delmerico
2022-02-02 14:27:32 +00:00
committed by Gerrit Code Review
parent f8a4bb6d7f c06ea03c9e
commit ca1701f518
5 changed files with 139 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
android/bazel.go
View File

@@ -291,7 +291,7 @@ var (
"external/bouncycastle": Bp2BuildDefaultTrue,
"external/brotli": Bp2BuildDefaultTrue,
"external/conscrypt": Bp2BuildDefaultTrue,
"external/error_prone": Bp2BuildDefaultTrue,
"external/error_prone": Bp2BuildDefaultTrueRecursively,
"external/fmtlib": Bp2BuildDefaultTrueRecursively,
"external/google-benchmark": Bp2BuildDefaultTrueRecursively,
"external/googletest": Bp2BuildDefaultTrueRecursively,
@@ -431,8 +431,19 @@ var (
"libprotobuf-internal-protos", // b/210751803, we don't handle path property for filegroups
"libprotobuf-internal-python-srcs", // b/210751803, we don't handle path property for filegroups
"libprotobuf-java-full", // b/210751803, we don't handle path property for filegroups
"host-libprotobuf-java-full", // b/210751803, we don't handle path property for filegroups
"libprotobuf-java-util-full", // b/210751803, we don't handle path property for filegroups
"conscrypt", // b/210751803, we don't handle path property for filegroups
"conscrypt", // b/210751803, we don't handle path property for filegroups
"conscrypt-for-host", // b/210751803, we don't handle path property for filegroups
"host-libprotobuf-java-lite", // b/217236083, java_library cannot have deps without srcs
"host-libprotobuf-java-micro", // b/217236083, java_library cannot have deps without srcs
"host-libprotobuf-java-nano", // b/217236083, java_library cannot have deps without srcs
"error_prone_core", // b/217236083, java_library cannot have deps without srcs
"bouncycastle-host", // b/217236083, java_library cannot have deps without srcs
"apex_manifest_proto_java", // b/215230097, we don't handle .proto files in java_library srcs attribute
// python protos
"libprotobuf-python", // contains .proto sources