Browse Source

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
Liz Kammer 1 year ago
parent
commit
748209cb6b
4 changed files with 6 additions and 18 deletions
  1. 0 17
      android/allowlists/allowlists.go
  2. 2 1
      android/filegroup.go
  3. 2 0
      android/filegroup_test.go
  4. 2 0
      java/java_test.go

+ 0 - 17
android/allowlists/allowlists.go

@@ -1334,23 +1334,6 @@ var (
 		"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{

+ 2 - 1
android/filegroup.go

@@ -234,7 +234,8 @@ func (fg *fileGroup) QueueBazelCall(ctx BaseModuleContext) {
 }
 
 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) {

+ 2 - 0
android/filegroup_test.go

@@ -6,6 +6,8 @@ import (
 )
 
 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")

+ 2 - 0
java/java_test.go

@@ -1288,6 +1288,8 @@ func TestAidlExportIncludeDirsFromImports(t *testing.T) {
 }
 
 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",