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

Commit 5160f02b authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Use the factored out bug 24465209 workaround for libjnigraphics." into main am: be74c988 

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



Change-Id: I075c8d8964831689de913fef7b68652ff8375f74
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4ecd2a1 be74c988

native/graphics/jni/Android.bp

+3 −7
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ package { 


cc_library_shared {

    name: "libjnigraphics",

    defaults: [

        "bug_24465209_workaround",

    ],



    cflags: [

        "-Wall",
@@ -47,13 +50,6 @@ cc_library_shared { 


    static_libs: ["libarect"],



    arch: {

        arm: {

            // TODO: This is to work around b/24465209. Remove after root cause is fixed

            pack_relocations: false,

            ldflags: ["-Wl,--hash-style=both"],

        },

    },

    host_supported: true,

    target: {

        android: {