diff options
| -rw-r--r-- | core/jni/Android.bp | 10 | ||||
| -rw-r--r-- | libs/hwui/Android.bp | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 877349227406..8d25773cb34a 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -67,11 +67,12 @@ cc_library_shared { "libhwui", "liblog", "libminikin", - "libnativehelper", "libz", "libziparchive", ], + static_libs: ["libnativehelper_lazy"], + export_include_dirs: [ ".", "include", @@ -284,12 +285,13 @@ cc_library_shared { "libstatspull", ], export_shared_lib_headers: [ - // AndroidRuntime.h depends on nativehelper/jni.h - "libnativehelper", - // our headers include libnativewindow's public headers "libnativewindow", ], + export_static_lib_headers: [ + // AndroidRuntime.h depends on nativehelper/jni.h + "libnativehelper_lazy", + ], header_libs: [ "bionic_libc_platform_headers", "dnsproxyd_protocol_headers", diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index fdb278e29cc7..6220abed05eb 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -343,12 +343,13 @@ cc_defaults { "libharfbuzz_ng", "liblog", "libminikin", - "libnativehelper", "libz", "libziparchive", "libjpeg", ], + static_libs: ["libnativehelper_lazy"], + target: { android: { srcs: [ // sources that depend on android only libraries |