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

Stop using VNDK from product partition

Browse Source 
Product modules install required vndk modules in /product/lib[64].
But still the product modules can link to the llndk from system
partition using the list in /system/etc/llndk.libraries.txt.
To install /system/etc/llndk.libraries.txt file, use
llndk_libraries_txt singleton without versioned name.

Until VNDK is fully removed, the vndk apex must install the versioned
llndk.libraries.<ver>.txt file to the vndk apex.
Use llndk_libraries_txt_for_apex singleton for this purpose.

Test: lunch cf_x86_64_phone-next-userdebug; m
Test: atest GtsVndkDependencyTestCases
Bug: 299867815
Bug: 302255959
Change-Id: I058616081fe31597a9b76b772b69927807436896
This commit is contained in:
Justin Yun
2023-10-25 13:25:32 +09:00
parent c2d3ffcae3
commit d578412cf1
3 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apex/apex_test.go
View File

@@ -3882,13 +3882,24 @@ func TestVndkApexWithPrebuilt(t *testing.T) {
func vndkLibrariesTxtFiles(vers ...string) (result string) {
for _, v := range vers {
if v == "current" {
for _, txt := range []string{"llndk", "vndkcore", "vndksp", "vndkprivate", "vndkproduct"} {
for _, txt := range []string{"vndkcore", "vndksp", "vndkprivate", "vndkproduct"} {
result += `
` + txt + `_libraries_txt {
name: "` + txt + `.libraries.txt",
insert_vndk_version: true,
}
`
}
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 += `