Revert "Revert "Revert "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp"""
This reverts commit e3e7711ac60adea25eb64c95a6fad0b1f7005d7f.
Reason for revert: CI fixed
(cherry picked from https://android-review.googlesource.com/q/commit:21bfa5816dab69110c345b9d020dcab3df1402e8)
Merged-In: Ib038241eae5ec6af78ac24105c891db55a4d0544
Change-Id: Ib038241eae5ec6af78ac24105c891db55a4d0544
diff --git a/android/filegroup.go b/android/filegroup.go
index f30ee51..121368d 100644
--- a/android/filegroup.go
+++ b/android/filegroup.go
@@ -82,7 +82,6 @@
type bazelAidlLibraryAttributes struct {
Srcs bazel.LabelListAttribute
Strip_import_prefix *string
- Deps bazel.LabelListAttribute
}
// api srcs can be contained in filegroups.
@@ -121,12 +120,9 @@
// and then convert
if fg.ShouldConvertToAidlLibrary(ctx) {
tags := []string{"apex_available=//apex_available:anyapex"}
- deps := bazel.MakeLabelListAttribute(BazelLabelForModuleDeps(ctx, fg.properties.Aidl.Deps))
-
attrs := &bazelAidlLibraryAttributes{
Srcs: srcs,
Strip_import_prefix: fg.properties.Path,
- Deps: deps,
}
props := bazel.BazelTargetModuleProperties{
@@ -192,14 +188,6 @@
// Create a make variable with the specified name that contains the list of files in the
// filegroup, relative to the root of the source tree.
Export_to_make_var *string
-
- // aidl is explicitly provided for implicit aidl dependencies
- // TODO(b/278298615): aidl prop is a no-op in Soong and is an escape hatch
- // to include implicit aidl dependencies for bazel migration compatibility
- Aidl struct {
- // List of aidl files or filegroup depended on by srcs
- Deps []string `android:"path"`
- }
}
type fileGroup struct {
diff --git a/bp2build/filegroup_conversion_test.go b/bp2build/filegroup_conversion_test.go
index 273d556..7ce559d 100644
--- a/bp2build/filegroup_conversion_test.go
+++ b/bp2build/filegroup_conversion_test.go
@@ -105,42 +105,6 @@
}
}
-func TestFilegroupWithAidlDeps(t *testing.T) {
- bp := `
- filegroup {
- name: "bar",
- srcs: ["bar.aidl"],
- }
- filegroup {
- name: "foo",
- srcs: ["aidl/foo.aidl"],
- path: "aidl",
- aidl: {
- deps: [":bar"],
- }
- }`
-
- t.Run("filegroup with aidl deps", func(t *testing.T) {
- expectedBazelTargets := []string{
- MakeBazelTargetNoRestrictions("aidl_library", "bar", AttrNameToString{
- "srcs": `["bar.aidl"]`,
- "tags": `["apex_available=//apex_available:anyapex"]`,
- }),
- MakeBazelTargetNoRestrictions("aidl_library", "foo", AttrNameToString{
- "srcs": `["aidl/foo.aidl"]`,
- "strip_import_prefix": `"aidl"`,
- "deps": `[":bar"]`,
- "tags": `["apex_available=//apex_available:anyapex"]`,
- }),
- }
- runFilegroupTestCase(t, Bp2buildTestCase{
- Description: "filegroup with aidl deps",
- Blueprint: bp,
- ExpectedBazelTargets: expectedBazelTargets,
- })
- })
-}
-
func TestFilegroupWithAidlAndNonAidlSrcs(t *testing.T) {
runFilegroupTestCase(t, Bp2buildTestCase{
Description: "filegroup with aidl and non-aidl srcs",
