commit 452e7aa41c2719c66f94878c964e3b5e18c3c5f0
author Justin Yun <justinyun@google.com> Wed Oct 25 13:35:23 2023 +0900
committer Justin Yun <justinyun@google.com> Wed Oct 25 13:40:15 2023 +0900
tree a2e47c6ed5fc8e9d60017aed7f4947914261618b
parent 2aeb758a69fce1f315bdeab824a68f9ab73a993b

Define llndk_libraries_txt_for_apex

llndk_libraries_txt is to install llndk.libraries.txt file to
/system/etc. To installed the versioned txt file for vndk apex, add
llndk_libraries_txt_for_apex.

insert_vndk_version is changed to default false. Add
`insert_vndk_version: true,` if needed.

Test: lunch cf_x86_64_phone-next-userdebug; m
Test: atest GtsVndkDependencyTestCases
Bug: 299867815
Bug: 302255959
Change-Id: I269f66fdec57cc7c2a0d6490bd1767a6d83c9034

Android.bp

diff --git a/Android.bp b/Android.bp
index 458b0fe..5f9651f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,23 +20,32 @@
     name: "llndk.libraries.txt",
 }
 
+llndk_libraries_txt_for_apex {
+    name: "llndk.libraries.txt.apex",
+    stem: "llndk.libraries.txt",
+    insert_vndk_version: true,
+}
+
 vndkcore_libraries_txt {
     name: "vndkcore.libraries.txt",
+    insert_vndk_version: true,
 }
 
 vndksp_libraries_txt {
     name: "vndksp.libraries.txt",
+    insert_vndk_version: true,
 }
 
 vndkprivate_libraries_txt {
     name: "vndkprivate.libraries.txt",
+    insert_vndk_version: true,
 }
 
 vndkproduct_libraries_txt {
-  name: "vndkproduct.libraries.txt",
+    name: "vndkproduct.libraries.txt",
+    insert_vndk_version: true,
 }
 
 vndkcorevariant_libraries_txt {
-  name: "vndkcorevariant.libraries.txt",
-  insert_vndk_version: false,
+    name: "vndkcorevariant.libraries.txt",
 }