diff options
| -rw-r--r-- | android/filegroup.go | 2 | ||||
| -rw-r--r-- | bp2build/java_library_conversion_test.go | 20 |
2 files changed, 20 insertions, 2 deletions
diff --git a/android/filegroup.go b/android/filegroup.go index b6e37a50d..856c50e5a 100644 --- a/android/filegroup.go +++ b/android/filegroup.go @@ -50,7 +50,7 @@ var ( // ignoring case, checks for proto or protos as an independent word in the name, whether at the // beginning, end, or middle. e.g. "proto.foo", "bar-protos", "baz_proto_srcs" would all match filegroupLikelyProtoPattern = regexp.MustCompile("(?i)(^|[^a-z])proto(s)?([^a-z]|$)") - filegroupLikelyAidlPattern = regexp.MustCompile("(?i)(^|[^a-z])aidl([^a-z]|$)") + filegroupLikelyAidlPattern = regexp.MustCompile("(?i)(^|[^a-z])aidl(s)?([^a-z]|$)") ProtoSrcLabelPartition = bazel.LabelPartition{ Extensions: []string{".proto"}, diff --git a/bp2build/java_library_conversion_test.go b/bp2build/java_library_conversion_test.go index 7e4e44ec8..38571d4cc 100644 --- a/bp2build/java_library_conversion_test.go +++ b/bp2build/java_library_conversion_test.go @@ -567,12 +567,20 @@ filegroup { "b.aidl", ], } +filegroup { + name: "aidls_files", + srcs: [ + "a.aidl", + "b.aidl", + ], +} java_library { name: "example_lib", srcs: [ "a.java", "b.java", ":aidl_files", + ":aidls_files", ":random_other_files", ], sdk_version: "current", @@ -586,8 +594,18 @@ java_library { ]`, "tags": `["apex_available=//apex_available:anyapex"]`, }), + MakeBazelTargetNoRestrictions("aidl_library", "aidls_files", AttrNameToString{ + "srcs": `[ + "a.aidl", + "b.aidl", + ]`, + "tags": `["apex_available=//apex_available:anyapex"]`, + }), MakeBazelTarget("java_aidl_library", "example_lib_java_aidl_library", AttrNameToString{ - "deps": `[":aidl_files"]`, + "deps": `[ + ":aidl_files", + ":aidls_files", + ]`, }), MakeBazelTarget("java_library", "example_lib", AttrNameToString{ "deps": `[":example_lib_java_aidl_library"]`, |