From eb769d687a4c0c8637d349148fefb3855ffa90e2 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 19 Aug 2022 13:21:02 +0900 Subject: [PATCH] Use liblog_for_runtime_apex instead of liblog liblog_for_runtime_apex is a static variant of liblog which is explicitly marked as available to the runtime APEX. Any static dependency to liblog from inside the runtime APEX is changed from liblog to liblog_for_runtime_apex. Previously, to support the need for using liblog inside the runtime APEX, the entire (i.e. both static and shared variants) liblog module was marked as available to the runtime APEX, although in reality only the static variant of the library was needed there. This was not only looking dirty, but also has caused a problem like b/241259844. To fix this, liblog is separated into two parts. (1) liblog and (2) liblog_for_runtime_apex. (1) no longer is available to the runtime APEX and is intended to be depended on in most cases: either from the non-updatable platform, or from other APEXes. (2) is a static library which is explicitly marked as available to the runtime APEX and also visible to certain modules that are included in the runtime APEX. Bug: 241259844 Test: m and check that liblog depends on stub library of libc Change-Id: I10edd4487a6f090ef026acffe1ffbd067387a0d3 --- debuggerd/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index ad0231d8d..c15146b09 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -204,6 +204,7 @@ cc_library_static { header_libs: [ "bionic_libc_platform_headers", "gwp_asan_headers", + "liblog_headers", ], static_libs: [ @@ -212,7 +213,6 @@ cc_library_static { "liblzma", "libbase", "libcutils", - "liblog", ], runtime_libs: [ "libdexfile", // libdexfile_support dependency