StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move LLNDK related logic to llndk_library

Browse Source 
Currently VNDK contains some logic for LLNDK libraries as they are
treated in a similar way with VNDK. However, those logics should stay from
VNDK deprecation. To keep the logic, this change moves LLNDK related
logic into llndk_library.

Bug: 330100430
Test: Soong tests passed
Test: llndk.libraries.txt did not change from CF build
Change-Id: I1d02a3c2a398f1b1060b4f2bdd23af32310503bb
This commit is contained in:
Kiyoung Kim
2024-04-29 14:14:53 +09:00
parent 2d5e7579d4
commit 973cb6f555
5 changed files with 151 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apex/apex_test.go
View File

@@ -3671,34 +3671,13 @@ func ensureExactDeapexedContents(t *testing.T, ctx *android.TestContext, moduleN
func vndkLibrariesTxtFiles(vers ...string) (result string) {
for _, v := range vers {
if v == "current" {
for _, txt := range []string{"vndkcore", "vndksp", "vndkprivate", "vndkproduct"} {
result += `
` + txt + `_libraries_txt {
name: "` + txt + `.libraries.txt",
insert_vndk_version: true,
}
`
}
for _, txt := range []string{"llndk", "vndkcore", "vndksp", "vndkprivate", "vndkproduct"} {
result += `
llndk_libraries_txt {
name: "llndk.libraries.txt",
}
llndk_libraries_txt_for_apex {
name: "llndk.libraries.txt.apex",
stem: "llndk.libraries.txt",
insert_vndk_version: true,
}
`
} else {
for _, txt := range []string{"llndk", "vndkcore", "vndksp", "vndkprivate", "vndkproduct"} {
result += `
prebuilt_etc {
name: "` + txt + `.libraries.` + v + `.txt",
src: "dummy.txt",
}
`
}
}
}
return