Merge "Expand regex for likely aidl filegroups" into main (e88fe1fb) · Commits · e / os / android_build_soong

android/filegroup.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"},

+19 −1

Original line number	Diff line number	Diff line
		@@ -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",
		@@ -583,11 +591,21 @@ java_library {
		"srcs": `[
		"a.aidl",
		"b.aidl",
		]`,
		"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"]`,