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

Commit 83c09a48 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge changes Ia8b00053,I98851ea9 into main am: f3ebcb03 am: c01f9663

parents af6efe97 c01f9663
Loading
Loading
Loading
Loading
+11 −5
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ cc_library_shared {
            ],
        },
    },
    stubs: {
        symbol_file: "libjnigraphics.map.txt",
    },
}

// The headers module is in frameworks/native/Android.bp.
@@ -93,7 +96,10 @@ cc_defaults {
    ],
    static_libs: ["libarect"],
    fuzz_config: {
        cc: ["dichenzhang@google.com","scroggo@google.com"],
        cc: [
            "dichenzhang@google.com",
            "scroggo@google.com",
        ],
        asan_options: [
            "detect_odr_violation=1",
        ],