From ae75f994cc50837afe79d3bfbc576811e3602fef Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 16 Mar 2012 11:42:24 -0700 Subject: Add libmedia_native Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7 --- cmds/stagefright/Android.mk | 8 ++++---- core/jni/Android.mk | 1 + media/jni/Android.mk | 1 + media/jni/audioeffect/Android.mk | 3 ++- media/jni/soundpool/Android.mk | 3 ++- media/libaah_rtp/Android.mk | 2 +- media/libmedia/Android.mk | 2 +- media/libmediaplayerservice/Android.mk | 1 + media/libstagefright/Android.mk | 1 + services/audioflinger/Android.mk | 1 + services/camera/libcameraservice/Android.mk | 1 + voip/jni/rtp/Android.mk | 1 + 12 files changed, 17 insertions(+), 8 deletions(-) diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index e41b66605d68..30be7fad30f9 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \ SineSource.cpp LOCAL_SHARED_LIBRARIES := \ - libstagefright libmedia libutils libbinder libstagefright_foundation \ + libstagefright libmedia libmedia_native libutils libbinder libstagefright_foundation \ libskia libgui LOCAL_C_INCLUDES:= \ @@ -108,7 +108,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libgui \ - libstagefright_foundation libmedia + libstagefright_foundation libmedia libmedia_native LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ @@ -132,7 +132,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation \ - libmedia libgui libcutils libui + libmedia libmedia_native libgui libcutils libui LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ @@ -157,7 +157,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation \ - libmedia libgui libcutils libui + libmedia libmedia_native libgui libcutils libui LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 92b07b349472..5650d685e0d9 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -211,6 +211,7 @@ LOCAL_SHARED_LIBRARIES := \ libicuuc \ libicui18n \ libmedia \ + libmedia_native \ libwpa_client \ libjpeg \ libusbhost \ diff --git a/media/jni/Android.mk b/media/jni/Android.mk index a98275afa0e2..079a284b5c08 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -22,6 +22,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder \ libmedia \ + libmedia_native \ libskia \ libui \ libcutils \ diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk index b5d8b7b21a46..0059bb23abde 100644 --- a/media/jni/audioeffect/Android.mk +++ b/media/jni/audioeffect/Android.mk @@ -10,7 +10,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libandroid_runtime \ libnativehelper \ - libmedia + libmedia \ + libmedia_native LOCAL_C_INCLUDES := \ $(call include-path-for, audio-effects) diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk index 9ff2e243eabd..98d644921fe6 100644 --- a/media/jni/soundpool/Android.mk +++ b/media/jni/soundpool/Android.mk @@ -12,7 +12,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libandroid_runtime \ libnativehelper \ - libmedia + libmedia \ + libmedia_native LOCAL_MODULE:= libsoundpool diff --git a/media/libaah_rtp/Android.mk b/media/libaah_rtp/Android.mk index 1e87cf0471d6..6c927bae3c07 100644 --- a/media/libaah_rtp/Android.mk +++ b/media/libaah_rtp/Android.mk @@ -29,6 +29,7 @@ LOCAL_SHARED_LIBRARIES := \ libcommon_time_client \ libbinder \ libmedia \ + libmedia_native \ libstagefright \ libstagefright_foundation \ libutils @@ -37,4 +38,3 @@ LOCAL_LDLIBS := \ -lpthread include $(BUILD_SHARED_LIBRARY) - diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 8b009aa2383f..21e8f2995cee 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -48,7 +48,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox libicuuc libexpat \ libcamera_client libstagefright_foundation \ - libgui libdl libaudioutils + libgui libdl libaudioutils libmedia_native LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 41bcab07d28f..ba5c7763da53 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -23,6 +23,7 @@ LOCAL_SHARED_LIBRARIES := \ libvorbisidec \ libsonivox \ libmedia \ + libmedia_native \ libcamera_client \ libandroid_runtime \ libstagefright \ diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 047b4cb6d8e3..77714f3e94b3 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -79,6 +79,7 @@ LOCAL_SHARED_LIBRARIES := \ libicuuc \ liblog \ libmedia \ + libmedia_native \ libsonivox \ libssl \ libstagefright_omx \ diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 5164213b6fbc..1652cae8deb6 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -22,6 +22,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder \ libmedia \ + libmedia_native \ libhardware \ libhardware_legacy \ libeffects \ diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index e35435ef5400..3cae1f52b2dc 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -15,6 +15,7 @@ LOCAL_SHARED_LIBRARIES:= \ libbinder \ libcutils \ libmedia \ + libmedia_native \ libcamera_client \ libgui \ libhardware diff --git a/voip/jni/rtp/Android.mk b/voip/jni/rtp/Android.mk index 49b711d4b84e..d7257133b845 100644 --- a/voip/jni/rtp/Android.mk +++ b/voip/jni/rtp/Android.mk @@ -37,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ libmedia \ + libmedia_native \ libstagefright_amrnb_common LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc -- cgit v1.2.3-59-g8ed1b