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

Commit f8e6f8eb authored by Kris Alder's avatar Kris Alder Committed by Gerrit Code Review
Browse files

Merge changes I60cd5bb6,If997e256 

* changes:
  Added "libmedia_ndkformatpriv" static library
  NdkMediaFormatPriv.cpp: Removed JNI dependency
parents 58ca13b5 6a8a8dd5

media/libmedia/Android.bp

+33 −0
Original line number Diff line number Diff line
@@ -354,3 +354,36 @@ cc_library { 
        cfi: true,

    },

}



cc_library_static {

    name: "libmedia_ndkformatpriv",



    host_supported: true,



    srcs: [

        "NdkMediaFormatPriv.cpp",

        "NdkMediaErrorPriv.cpp",

    ],



    header_libs: [

        "libstagefright_foundation_headers",

        "libstagefright_headers",

        "media_ndk_headers",

    ],



    cflags: [

        "-DEXPORT=__attribute__((visibility(\"default\")))",

        "-Werror",

        "-Wall",

    ],



    export_include_dirs: ["include"],



    target: {

        darwin: {

            enabled: false,

        },

    },



    apex_available: ["com.android.media"],

}

media/libmedia/NdkMediaFormatPriv.cpp

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <media/NdkMediaFormatPriv.h>

#include <media/stagefright/foundation/AMessage.h>



#include <jni.h>



using namespace android;



namespace android {