Convert java_aconfig_library to bazel.
Bug: 297357579
Test: Unit test and AconfigJavaHostTest
Change-Id: Icf944cc0b2a7382107923d49b2d2ff0eb4113638
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 64cb2fa..3d64ae3 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -523,6 +523,7 @@
}
Bp2buildModuleAlwaysConvertList = []string{
+ "AconfigJavaHostTest",
// aconfig
"libonce_cell",
"libanyhow",
@@ -1002,6 +1003,7 @@
"cc_prebuilt_library_static",
"combined_apis",
"droiddoc_exported_dir",
+ "java_aconfig_library",
"java_import",
"java_import_host",
"java_sdk_library",
diff --git a/android/bazel_paths.go b/android/bazel_paths.go
index d8effaa..ac7d349 100644
--- a/android/bazel_paths.go
+++ b/android/bazel_paths.go
@@ -442,7 +442,8 @@
otherLabel := labelFromModule(ctx, m)
// TODO(b/165114590): Convert tag (":name{.tag}") to corresponding Bazel implicit output targets.
- if tag != "" && m.Name() == "framework-res" {
+ if (tag != "" && m.Name() == "framework-res") ||
+ (tag == ".generated_srcjars" && ctx.OtherModuleType(m) == "java_aconfig_library") {
otherLabel += tag
}