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

Convert libmedia_jni to Android.bp

Browse Source 
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
This commit is contained in:
Colin Cross
2017-05-15 18:10:40 -07:00
parent ef66f19128
commit 76de4f6b4d
15 changed files with 149 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -53,6 +53,7 @@ cc_library {
subdirs = [
"core/jni",
"libs/*",
"media/*",
"tools/*",
"native/android",
"native/graphics/jni",

8
core/jni/Android.bp
View File

@@ -277,12 +277,18 @@ 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
"libnativehelper",
// our headers include libnativewindow's public headers
"libnativewindow",
// 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"],
}

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

@@ -0,0 +1,82 @@
cc_library_shared {
name: "libmedia_jni",
srcs: [
"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_MediaDescrambler.cpp",
"android_media_MediaDrm.cpp",
"android_media_MediaExtractor.cpp",
"android_media_MediaHTTPConnection.cpp",
"android_media_MediaMetricsJNI.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",
"midi/android_media_midi_MidiDevice.cpp",
],
shared_libs: [
"libandroid_runtime",
"libnativehelper",
"libutils",
"libbinder",
"libmedia",
"libmediametrics",
"libmediadrm",
"libmidi",
"libskia",
"libui",
"liblog",
"libcutils",
"libgui",
"libstagefright",
"libstagefright_foundation",
"libcamera_client",
"libmtp",
"libexif",
"libpiex",
"libandroidfw",
],
header_libs: ["libhardware_headers"],
static_libs: ["libgrallocusage"],
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",
]

79
media/jni/Android.mk
View File

@@ -1,79 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
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_MediaDescrambler.cpp \
android_media_MediaDrm.cpp \
android_media_MediaExtractor.cpp \
android_media_MediaHTTPConnection.cpp \
android_media_MediaMetricsJNI.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 \
midi/android_media_midi_MidiDevice.cpp \
LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \
libnativehelper \
libutils \
libbinder \
libmedia \
libmediametrics \
libmediadrm \
libmidi \
libskia \
libui \
liblog \
libcutils \
libgui \
libstagefright \
libstagefright_foundation \
libcamera_client \
libmtp \
libexif \
libpiex \
libandroidfw
LOCAL_STATIC_LIBRARIES := \
libgrallocusage \
LOCAL_C_INCLUDES += \
external/libexif/ \
external/piex/ \
external/tremor/Tremor \
frameworks/base/core/jni \
frameworks/base/libs/hwui \
frameworks/base/media/native \
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

@@ -27,7 +27,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>

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

@@ -0,0 +1,25 @@
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",
],
cflags: [
"-Wall",
"-Werror",
"-Wunused",
"-Wunreachable-code",
],
}

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

@@ -1,21 +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_MODULE:= libaudioeffect_jni
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY)

2
media/jni/midi/android_media_midi_MidiDevice.cpp
View File

@@ -18,7 +18,7 @@
#define LOG_TAG "Midi-JNI"
#include <android_util_Binder.h>
#include <midi/midi_internal.h>
#include <midi_internal.h>
#include <nativehelper/jni.h>
#include <utils/Log.h>

1
media/native/Android.bp Normal file
View File

@@ -0,0 +1 @@
subdirs = ["*"]

33
media/native/midi/Android.bp
View File

@@ -12,10 +12,31 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// The headers module is in frameworks/media/native/midi/Android.bp.
ndk_library {
name: "libmidi.ndk",
symbol_file: "libmidi.map.txt",
first_version: "26",
// unversioned_until: "current",
cc_library_shared {
name: "libmidi",
srcs: [
"midi.cpp",
":IMidiDeviceServer.aidl",
],
aidl: {
include_dirs: ["frameworks/base/media/java"],
export_aidl_headers: true,
},
cflags: [
"-Wall",
"-Werror",
"-O0",
],
shared_libs: [
"liblog",
"libbinder",
"libutils",
"libmedia",
],
export_include_dirs: ["."],
}

20
media/native/midi/Android.mk
View File

@@ -1,20 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
../../java/android/media/midi/IMidiDeviceServer.aidl \
midi.cpp
LOCAL_AIDL_INCLUDES := \
$(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \
frameworks/native/aidl/binder
LOCAL_CFLAGS += -Wall -Werror -O0
LOCAL_MODULE := libmidi
LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := liblog libbinder libutils libmedia
include $(BUILD_SHARED_LIBRARY)