From 9837d6be1fc95d0f9cdb4a13fb7c267d67ec055b Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 18 Dec 2017 20:43:35 +0900 Subject: [PATCH] Don't install unnecessary VNDK libs vndk_package is a phony module that includes ALL VNDK libs found in the source code. As a result, VNDK libs that were actually not needed for the device have been installed consuming storage. For example, /system/lib/vndk/android.hardware.automotive*.so files were installed even though walleye/taimen do not have automotive HALs. VNDK libs are now installed by their link time dependencies (i.e. if a vendor module uses libcutils, then /system/lib[64]/vndk-sp/libcutils.so is automatically installed.). By the way, there is a few number of VNDK libs that do not have any link time dependency from vendor modules. They are always opened via dlopen. In such cases, the vndk modules are added to `required` or `LOCAL_REQUIRED_MODULES` of the module that dlopens them. Bug: 67002788 Test: walleye builds and boots to the UI Test: basic functionalities work (sound, camera, camcorder, slow-mo, youtube, wifi, bluetooth) Change-Id: I321256b9d20f20a9062c6d13b1745d8727eda558 --- libnativeloader/Android.bp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp index 4b21edc46..17983bc14 100644 --- a/libnativeloader/Android.bp +++ b/libnativeloader/Android.bp @@ -19,4 +19,8 @@ cc_library { "-fvisibility=hidden", ], export_include_dirs: ["include"], + required: [ + "llndk.libraries.txt", + "vndksp.libraries.txt", + ], }