diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-16 11:42:24 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-03-16 11:51:30 -0700 |
| commit | ae75f994cc50837afe79d3bfbc576811e3602fef (patch) | |
| tree | 54200155dc1dc7f1b1e96c3cef9a48b6909af213 /media | |
| parent | 2937a9ea0a81a0400f0189221f775561ff3b0a6c (diff) | |
| download | frameworks_base-ae75f994cc50837afe79d3bfbc576811e3602fef.zip frameworks_base-ae75f994cc50837afe79d3bfbc576811e3602fef.tar.gz frameworks_base-ae75f994cc50837afe79d3bfbc576811e3602fef.tar.bz2 | |
Add libmedia_native
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/Android.mk | 1 | ||||
| -rw-r--r-- | media/jni/audioeffect/Android.mk | 3 | ||||
| -rw-r--r-- | media/jni/soundpool/Android.mk | 3 | ||||
| -rw-r--r-- | media/libaah_rtp/Android.mk | 2 | ||||
| -rw-r--r-- | media/libmedia/Android.mk | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 1 |
7 files changed, 9 insertions, 4 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index a98275a..079a284 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 b5d8b7b..0059bb2 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 9ff2e24..98d6449 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 1e87cf0..6c927ba 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 8b009aa..21e8f29 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 41bcab0..ba5c776 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 047b4cb..77714f3 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 \ |