Merge "Sort always convert by type list" into main

2023-09-18 18:03:58 +00:00
parent faa7c7c102 4fc71fff30
commit 35f1ae0721
1 changed files with 5 additions and 5 deletions
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -907,20 +907,20 @@ var (
 	}

 	Bp2buildModuleTypeAlwaysConvertList = []string{
+		"aconfig_declarations",
+		"aconfig_value_set",
+		"aconfig_values",
 		"aidl_interface_headers",
 		"bpf",
 		"combined_apis",
 		"droiddoc_exported_dir",
-		"license",
-		"linker_config",
 		"java_import",
 		"java_import_host",
 		"java_sdk_library",
+		"license",
+		"linker_config",
 		"sysprop_library",
 		"xsd_config",
-		"aconfig_declarations",
-		"aconfig_values",
-		"aconfig_value_set",
 	}

 	// Add the names of modules that bp2build should never convert, if it is