Disable all filegroups in mixed builds
Rather than individually denylisting filegroups until we prioritize a
solution for mixed builds that will correctly integrate into uses such
as proto, aidl, gensrcs, etc.
Test: mixed_droid
Change-Id: Iddbd391af7dd7cabc892b2b26dbc68e3aa506471
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 6165239..1cc4d54 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -1334,23 +1334,6 @@
"prebuilt_platform-robolectric-4.4-prebuilt",
"prebuilt_platform-robolectric-4.5.1-prebuilt",
"prebuilt_currysrc_org.eclipse",
-
- // TODO(b/247782695 and/or b/242847534) Fix mixed build between unconverted gensrcs and converted filegroup
- "connectivity_service_proto",
- "data_stall_event_proto",
- "device_policy_proto",
- "dns_resolver_proto",
- "ipconnectivity-proto-src",
- "launcher_proto",
- "libstats_atom_enum_protos",
- "libstats_atom_message_protos",
- "network_stack_proto",
- "service-permission-streaming-proto-sources",
- "srcs_bluetooth_protos",
- "srcs_bluetooth_leaudio_protos",
- "style_proto",
- "tethering_proto",
- "text_classifier_proto",
}
ProdMixedBuildsEnabledList = []string{
diff --git a/android/filegroup.go b/android/filegroup.go
index 6b11172..af4d89a 100644
--- a/android/filegroup.go
+++ b/android/filegroup.go
@@ -234,7 +234,8 @@
}
func (fg *fileGroup) IsMixedBuildSupported(ctx BaseModuleContext) bool {
- return true
+ // TODO(b/247782695), TODO(b/242847534) Fix mixed builds for filegroups
+ return false
}
func (fg *fileGroup) ProcessBazelQueryResponse(ctx ModuleContext) {
diff --git a/android/filegroup_test.go b/android/filegroup_test.go
index a7ea805..8292d5e 100644
--- a/android/filegroup_test.go
+++ b/android/filegroup_test.go
@@ -6,6 +6,8 @@
)
func TestFileGroupWithPathProp(t *testing.T) {
+ // TODO(b/247782695), TODO(b/242847534) Fix mixed builds for filegroups
+ t.Skip("Re-enable once filegroups are corrected for mixed builds")
outBaseDir := "outputbase"
pathPrefix := outBaseDir + "/execroot/__main__"
expectedOutputfile := filepath.Join(pathPrefix, "a/b/c/d/test.aidl")
diff --git a/java/java_test.go b/java/java_test.go
index d2373e3..3b86f9a 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -1288,6 +1288,8 @@
}
func TestAidlIncludeDirFromConvertedFileGroupWithPathPropInMixedBuilds(t *testing.T) {
+ // TODO(b/247782695), TODO(b/242847534) Fix mixed builds for filegroups
+ t.Skip("Re-enable once filegroups are corrected for mixed builds")
bp := `
filegroup {
name: "foo_aidl",