diff --git a/Android.bp b/Android.bp index 9ba400472bc4f..6fc0aa9c98c42 100644 --- a/Android.bp +++ b/Android.bp @@ -15,6 +15,7 @@ subdirs = [ "core/jni", "libs/*", + "media/*", "native/android", "native/graphics/jni", ] diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 7d5f8ee16a14c..c8784f857ea79 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -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", + ], } diff --git a/media/java/Android.bp b/media/java/Android.bp new file mode 100644 index 0000000000000..0810699abf0a8 --- /dev/null +++ b/media/java/Android.bp @@ -0,0 +1,4 @@ +filegroup { + name: "IMidiDeviceServer.aidl", + srcs: ["android/media/midi/IMidiDeviceServer.aidl"], +} diff --git a/media/jni/Android.bp b/media/jni/Android.bp new file mode 100644 index 0000000000000..d419f7e3cae4c --- /dev/null +++ b/media/jni/Android.bp @@ -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", +] diff --git a/media/jni/Android.mk b/media/jni/Android.mk deleted file mode 100644 index 8640565bd91ac..0000000000000 --- a/media/jni/Android.mk +++ /dev/null @@ -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)) diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index 724fc02271e30..c655b7c3c5ee8 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp index d5d9fc94bf290..56df32f79cb93 100644 --- a/media/jni/android_media_ImageWriter.cpp +++ b/media/jni/android_media_ImageWriter.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/media/jni/android_media_Utils.cpp b/media/jni/android_media_Utils.cpp index c62d93036c2ea..458d8471dafdd 100644 --- a/media/jni/android_media_Utils.cpp +++ b/media/jni/android_media_Utils.cpp @@ -17,6 +17,7 @@ // #define LOG_NDEBUG 0 #define LOG_TAG "AndroidMediaUtils" +#include #include #include "android_media_Utils.h" diff --git a/media/jni/android_media_Utils.h b/media/jni/android_media_Utils.h index 39c155439767d..af2f2d7bbe5d8 100644 --- a/media/jni/android_media_Utils.h +++ b/media/jni/android_media_Utils.h @@ -21,7 +21,6 @@ #include "src/piex.h" #include -#include #include #include #include diff --git a/media/jni/audioeffect/Android.bp b/media/jni/audioeffect/Android.bp new file mode 100644 index 0000000000000..8ac139d482bed --- /dev/null +++ b/media/jni/audioeffect/Android.bp @@ -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", + ], +} diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk deleted file mode 100644 index 8bd8857d8ba64..0000000000000 --- a/media/jni/audioeffect/Android.mk +++ /dev/null @@ -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)