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

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

Merge changes Iad45efb8,I06a4a790 

* changes:
  Added "libmediandk_format" static library
  NdkMediaFormat.cpp: Removed JNI dependency
parents 2efdbb90 af62b866

media/ndk/Android.bp

+38 −0
Original line number Diff line number Diff line
@@ -191,3 +191,41 @@ cc_test { 
        "frameworks/av/media/ndk/",

    ],

}



cc_library_static {

    name: "libmediandk_format",



    host_supported: true,



    srcs: [

        "NdkMediaFormat.cpp",

    ],



    header_libs: [

        "libstagefright_foundation_headers",

    ],



    cflags: [

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

        "-Werror",

        "-Wall",

    ],



    export_include_dirs: ["include"],



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

        cfi: true,

    },



    target: {

        darwin: {

            enabled: false,

        },

    },



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

}

media/ndk/NdkMediaFormat.cpp

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
#include <utils/StrongPointer.h>

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

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

#include <android_util_Binder.h>



#include <jni.h>



using namespace android;