Merge "Convert libmedia_jni to Android.bp" (85faffa7) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		subdirs = [
		"core/jni",
		"libs/*",
		"media/*",
		"native/android",
		"native/graphics/jni",
		]

core/jni/Android.bp

+11 −3

Original line number	Diff line number	Diff line
		@@ -271,7 +271,15 @@ cc_library_shared {
		],

		local_include_dirs: ["android/graphics"],
		export_include_dirs: ["include"],
		export_include_dirs: [
		".",
		"include",
		],
		export_shared_lib_headers: [
		// AndroidRuntime.h depends on nativehelper/jni.h
		export_shared_lib_headers: ["libnativehelper"],
		"libnativehelper",

		// GraphicsJNI.h includes hwui headers
		"libhwui",
		],
		}

media/java/Android.bp

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		filegroup {
		name: "IMidiDeviceServer.aidl",
		srcs: ["android/media/midi/IMidiDeviceServer.aidl"],
		}

media/jni/Android.bp

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "libmedia_jni",

		srcs: [
		"android_media_ExifInterface.cpp",
		"android_media_ImageWriter.cpp",
		"android_media_ImageReader.cpp",
		"android_media_MediaCrypto.cpp",
		"android_media_MediaCodec.cpp",
		"android_media_MediaCodecList.cpp",
		"android_media_MediaDataSource.cpp",
		"android_media_MediaDrm.cpp",
		"android_media_MediaExtractor.cpp",
		"android_media_MediaHTTPConnection.cpp",
		"android_media_MediaMetadataRetriever.cpp",
		"android_media_MediaMuxer.cpp",
		"android_media_MediaPlayer.cpp",
		"android_media_MediaProfiles.cpp",
		"android_media_MediaRecorder.cpp",
		"android_media_MediaScanner.cpp",
		"android_media_MediaSync.cpp",
		"android_media_ResampleInputStream.cpp",
		"android_media_SyncParams.cpp",
		"android_media_Utils.cpp",
		"android_mtp_MtpDatabase.cpp",
		"android_mtp_MtpDevice.cpp",
		"android_mtp_MtpServer.cpp",
		],

		shared_libs: [
		"libandroid_runtime",
		"libnativehelper",
		"libutils",
		"libbinder",
		"libmedia",
		"libmediadrm",
		"libskia",
		"libui",
		"liblog",
		"libcutils",
		"libgui",
		"libstagefright",
		"libstagefright_foundation",
		"libcamera_client",
		"libmtp",
		"libusbhost",
		"libexif",
		"libpiex",
		"libandroidfw",
		],

		header_libs: ["libhardware_headers"],

		include_dirs: [
		"frameworks/base/core/jni",
		"frameworks/native/include/media/openmax",
		"system/media/camera/include",
		],

		export_include_dirs: ["."],

		export_shared_lib_headers: [
		"libpiex",
		],

		cflags: [
		"-Wall",
		"-Werror",
		"-Wno-error=deprecated-declarations",
		"-Wunused",
		"-Wunreachable-code",
		],
		}

		subdirs = [
		"audioeffect",
		]

media/jni/Android.mk

deleted100644 → 0

+0 −74

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		android_media_ExifInterface.cpp \
		android_media_ImageWriter.cpp \
		android_media_ImageReader.cpp \
		android_media_MediaCrypto.cpp \
		android_media_MediaCodec.cpp \
		android_media_MediaCodecList.cpp \
		android_media_MediaDataSource.cpp \
		android_media_MediaDrm.cpp \
		android_media_MediaExtractor.cpp \
		android_media_MediaHTTPConnection.cpp \
		android_media_MediaMetadataRetriever.cpp \
		android_media_MediaMuxer.cpp \
		android_media_MediaPlayer.cpp \
		android_media_MediaProfiles.cpp \
		android_media_MediaRecorder.cpp \
		android_media_MediaScanner.cpp \
		android_media_MediaSync.cpp \
		android_media_ResampleInputStream.cpp \
		android_media_SyncParams.cpp \
		android_media_Utils.cpp \
		android_mtp_MtpDatabase.cpp \
		android_mtp_MtpDevice.cpp \
		android_mtp_MtpServer.cpp \

		LOCAL_SHARED_LIBRARIES := \
		libandroid_runtime \
		libnativehelper \
		libutils \
		libbinder \
		libmedia \
		libmediadrm \
		libskia \
		libui \
		liblog \
		libcutils \
		libgui \
		libstagefright \
		libstagefright_foundation \
		libcamera_client \
		libmtp \
		libusbhost \
		libexif \
		libpiex \
		libandroidfw

		LOCAL_STATIC_LIBRARIES := \

		LOCAL_C_INCLUDES += \
		external/libexif/ \
		external/piex/ \
		external/tremor/Tremor \
		frameworks/base/core/jni \
		frameworks/base/libs/hwui \
		frameworks/av/media/libmedia \
		frameworks/av/media/libstagefright \
		frameworks/av/media/mtp \
		frameworks/native/include/media/openmax \
		$(call include-path-for, libhardware)/hardware \
		$(PV_INCLUDES) \
		$(JNI_H_INCLUDE)

		LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunreachable-code

		LOCAL_MODULE:= libmedia_jni

		include $(BUILD_SHARED_LIBRARY)

		# build libsoundpool.so
		# build libaudioeffect_jni.so
		include $(call all-makefiles-under,$(LOCAL_PATH))