Merge "Allowlist merged_txts dependencies and combined_apis type" am: 1841e5d023
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2439360 Change-Id: Ia207e04c3a62e9675d4716af763d290caf9d9220 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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",
|
||||
|
Reference in New Issue
Block a user