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

Commit 2d413e83 authored by Jared Duke's avatar Jared Duke
Browse files

Apply basic JNI version script to media JNI libs 

Strip all but JNI_OnLoad entrypoints, as this is the only
exported symbol required for JNI interaction. Native methods are
explicitly registered from JNI_OnLoad, and the libraries don't
have downstream native clients that rely on additional exports.

Bug: 306426514
Test: m + presubmit
Flag: EXEMPT bugfix
Change-Id: Ieebe03649bfdc2ced9eb303475877d146989b795
parent ab7d8b52

media/jni/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -15,12 +15,24 @@ license { 
    ],

}



filegroup {

    name: "jni_exports",

    srcs: ["jni_exports.lds"],

    visibility: [":__subpackages__"],

}



cc_defaults {

    name: "media_jni_lib_defaults",

    version_script: ":jni_exports",

}



cc_library_shared {

    name: "libmedia_jni",



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

        "libcodec2-internal-defaults",

        "media_jni_lib_defaults",

    ],

    min_sdk_version: "",

media/jni/audioeffect/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ package { 
cc_library_shared {

    name: "libaudioeffect_jni",



    defaults: [

        "media_jni_lib_defaults",

    ],



    srcs: [

        "android_media_AudioEffect.cpp",

        "android_media_SourceDefaultEffect.cpp",
@@ -35,8 +39,6 @@ cc_library_shared { 
        "framework-permission-aidl-cpp",

    ],



    version_script: "exports.lds",



    cflags: [

        "-Wall",

        "-Werror",

media/jni/audioeffect/exports.lds

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
{

    global:

        *;

    local:

        *android10Visualizer*;

};

media/jni/jni_exports.lds

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{

  # Only export the primary JNI loading entrypoint.

  global:

    JNI_OnLoad;



  # Hide everything else.

  local:

    *;

};