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 | b12153e36ae5e514d96c77d660b327d1a8f5000f (patch) | |
| tree | fbfe8dc937f925b7075786b969522fb9012ae69b | |
| parent | 6469edeeac6079b118e8f81252116c40574c9841 (diff) | |
| download | frameworks_av-b12153e36ae5e514d96c77d660b327d1a8f5000f.zip frameworks_av-b12153e36ae5e514d96c77d660b327d1a8f5000f.tar.gz frameworks_av-b12153e36ae5e514d96c77d660b327d1a8f5000f.tar.bz2 | |
Add libmedia_native
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
| -rw-r--r-- | cmds/stagefright/Android.mk | 8 | ||||
| -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 | ||||
| -rw-r--r-- | services/audioflinger/Android.mk | 1 | ||||
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 1 |
7 files changed, 10 insertions, 6 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index e41b666..30be7fa 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/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 \ diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 5164213..1652cae 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 e35435e..3cae1f5 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 |