From 75a38e70df25bf97d069cf63237c13cef3785c81 Mon Sep 17 00:00:00 2001
From: Zi Wang <mrziwang@google.com>
Date: Wed, 15 Feb 2023 22:52:47 -0800
Subject: [PATCH] Allowlist merged_txts dependencies and combined_apis type

Test: m and TH

Bug: 267600251
Change-Id: Ib9bef77ce3f72880125b4a323e6b3631179fd877
---
 android/allowlists/allowlists.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 89c2d195b..867d11b42 100644
--- 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",