From 81171a7e758712dd6b2ca11bbdaf112dc3e2d51c Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 24 Mar 2023 15:27:40 +0900 Subject: [PATCH] Link dependencies statically This reduces the APEX size from 6754304 to 4378624. Bug: 274818387 Test: m com.google.android.widevine Test: adb install $OUT/vendor/apex/com.google.android.widevine.apex Test: adb reboot Change-Id: Ib31291e5ee35297b9d85120f5eca118ebf10f55f (cherry picked from commit 78f0b81ece9755639e352852d518fc44386e5374) --- libwvdrmengine/Android.bp | 45 ++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp index 6dba7b24..606a5185 100644 --- a/libwvdrmengine/Android.bp +++ b/libwvdrmengine/Android.bp @@ -104,13 +104,32 @@ cc_defaults { header_libs: ["libstagefright_foundation_headers"], shared_libs: [ - "android.hardware.drm-V1-ndk", - "libbase", "libbinder_ndk", + "libcrypto", "liblog", - "libutils", - "libwvaidl", ], + + static_libs: [ + "android.hardware.common-V2-ndk", + "android.hardware.drm-V1-ndk", + "libaidlcommonsupport", + "libbase", + "libcdm_protos", + "libcdm_utils", + "libcdm", + "libcutils", + "libjsmn", + "libjsoncpp", + "libprotobuf-cpp-lite", + "libutils", + "libwv_odk", + "libwvaidl", + "libwvdrmcryptoplugin_aidl", + "libwvdrmdrmplugin_aidl", + "libwvlevel3", + ], + + stl: "c++_static", } // ---------------------------------------------------------------------------- @@ -131,10 +150,10 @@ cc_binary { shared_libs: [ "libbinder_ndk", - "libprotobuf-cpp-lite", ], static_libs: [ "lib_apex_manifest_minimal_proto_lite", + "libprotobuf-cpp-lite", ], init_rc: ["src/android.hardware.drm-service.widevine.rc"], @@ -210,7 +229,7 @@ cc_library_static { // ---------------------------------------------------------------------------- // Builds libwvaidl.so // -cc_library_shared { +cc_library { name: "libwvaidl", srcs: [ @@ -237,28 +256,28 @@ cc_library_shared { static_libs: [ "android.hardware.common-V2-ndk", + "android.hardware.drm-V1-ndk", "libaidlcommonsupport", - "libcdm", + "libbase", "libcdm_protos", "libcdm_utils", + "libcdm", + "libcutils", "libjsmn", "libjsoncpp", + "libprotobuf-cpp-lite", + "libutils", + "libwv_odk", "libwvdrmcryptoplugin_aidl", "libwvdrmdrmplugin_aidl", "libwvlevel3", - "libwv_odk", ], shared_libs: [ - "android.hardware.drm-V1-ndk", - "libbase", "libbinder_ndk", "libcrypto", - "libcutils", "libdl", "liblog", - "libprotobuf-cpp-lite", - "libutils", ], header_libs: ["libstagefright_foundation_headers"],