Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert libmedia_jni to Android.bp"

Browse Source 
am: 85faffa7ef

Change-Id: I7afbf6dda3dab6a3c36576e2c118b1accdcc2a17
This commit is contained in:
Colin Cross
2017-05-17 15:29:29 +00:00
committed by android-build-merger
parent f421d60824 85faffa7ef
commit 162d19f590
11 changed files with 123 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

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

14
core/jni/Android.bp
View File

@@ -271,7 +271,15 @@ cc_library_shared {
],
local_include_dirs: ["android/graphics"],
export_include_dirs: ["include"],
// AndroidRuntime.h depends on nativehelper/jni.h
export_shared_lib_headers: ["libnativehelper"],
export_include_dirs: [
".",
"include",
],
export_shared_lib_headers: [
// AndroidRuntime.h depends on nativehelper/jni.h
"libnativehelper",
// GraphicsJNI.h includes hwui headers
"libhwui",
],
}

4
media/java/Android.bp Normal file
View File

@@ -0,0 +1,4 @@
filegroup {
name: "IMidiDeviceServer.aidl",
srcs: ["android/media/midi/IMidiDeviceServer.aidl"],
}

77
media/jni/Android.bp Normal file
View File

@@ -0,0 +1,77 @@
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",
]

74
media/jni/Android.mk
View File

@@ -1,74 +0,0 @@
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))

1
media/jni/android_media_ImageReader.cpp
View File

@@ -26,7 +26,6 @@
#include <gui/BufferItemConsumer.h>
#include <gui/Surface.h>
#include <camera3.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/android_view_Surface.h>

1
media/jni/android_media_ImageWriter.cpp
View File

@@ -25,7 +25,6 @@
#include <gui/Surface.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/android_view_Surface.h>
#include <camera3.h>
#include <jni.h>
#include <JNIHelp.h>

1
media/jni/android_media_Utils.cpp
View File

@@ -17,6 +17,7 @@
// #define LOG_NDEBUG 0
#define LOG_TAG "AndroidMediaUtils"
#include <hardware/camera3.h>
#include <utils/Log.h>
#include "android_media_Utils.h"

1
media/jni/android_media_Utils.h
View File

@@ -21,7 +21,6 @@
#include "src/piex.h"
#include <android_runtime/AndroidRuntime.h>
#include <camera3.h>
#include <gui/CpuConsumer.h>
#include <jni.h>
#include <JNIHelp.h>

29
media/jni/audioeffect/Android.bp Normal file
View File

@@ -0,0 +1,29 @@
cc_library_shared {
name: "libaudioeffect_jni",
srcs: [
"android_media_AudioEffect.cpp",
"android_media_Visualizer.cpp",
],
shared_libs: [
"liblog",
"libcutils",
"libutils",
"libandroid_runtime",
"libnativehelper",
"libmedia",
"libaudioclient",
],
header_libs: [
"libaudioeffects",
],
cflags: [
"-Wall",
"-Werror",
"-Wunused",
"-Wunreachable-code",
],
}

24
media/jni/audioeffect/Android.mk
View File

@@ -1,24 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
android_media_AudioEffect.cpp \
android_media_Visualizer.cpp
LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \
libutils \
libandroid_runtime \
libnativehelper \
libmedia \
libaudioclient \
LOCAL_C_INCLUDES := \
$(call include-path-for, audio-effects)
LOCAL_MODULE:= libaudioeffect_jni
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY)