Merge changes I60cd5bb6,If997e256 am: f8e6f8ebca (62071b68) · Commits · e / os / android_frameworks_av

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"],
		}

+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 {