Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e32b9e7b authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "libandroid_runtime,libhwui: use libnativehelper_lazy" am: 0248d32d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32e9b1b9eae25f35ced52948854977b5c2b1c4de
parents be473bf8 0248d32d

core/jni/Android.bp

+6 −4
Original line number Diff line number Diff line
@@ -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",

libs/hwui/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -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