Merge "Allowlist merged_txts dependencies and combined_apis type"

2023-03-06 16:28:45 +00:00
parent 0eee856e69 75a38e70df
commit 1841e5d023
1 changed files with 7 additions and 0 deletions
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -689,11 +689,18 @@ var (

 		//kotlin srcs in android_binary
 		"MusicKotlin",
+
+		// checked in current.txt for merged_txts
+		"non-updatable-current.txt",
+		"non-updatable-system-current.txt",
+		"non-updatable-module-lib-current.txt",
+		"non-updatable-system-server-current.txt",
 	}

 	Bp2buildModuleTypeAlwaysConvertList = []string{
 		"aidl_interface_headers",
 		"bpf",
+		"combined_apis",
 		"license",
 		"linker_config",
 		"java_import",