diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-10-30 16:19:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-30 16:19:56 -0700 |
| commit | b7d55a839356ad55316b5dd5b83396b69d391ce3 (patch) | |
| tree | 96e02180cd3fb30531692fa83a8fc5322af380d4 | |
| parent | 670d4b7520bca8c6b3c59db2640698358d83aca6 (diff) | |
| parent | c41590251aa84c078c942d258e838aad814b73a5 (diff) | |
| download | frameworks_av-b7d55a839356ad55316b5dd5b83396b69d391ce3.tar.gz frameworks_av-b7d55a839356ad55316b5dd5b83396b69d391ce3.tar.bz2 frameworks_av-b7d55a839356ad55316b5dd5b83396b69d391ce3.zip | |
Merge "Remove obsolete references to libmedia_native"
| -rw-r--r-- | cmds/stagefright/Android.mk | 8 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 1 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 1 |
7 files changed, 5 insertions, 11 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 1247588dbf..f60b1a49b9 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \ SineSource.cpp LOCAL_SHARED_LIBRARIES := \ - libstagefright libmedia libmedia_native libutils libbinder libstagefright_foundation \ + libstagefright libmedia libutils libbinder libstagefright_foundation \ libjpeg libgui LOCAL_C_INCLUDES:= \ @@ -104,7 +104,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libgui \ - libstagefright_foundation libmedia libmedia_native libcutils + libstagefright_foundation libmedia libcutils LOCAL_C_INCLUDES:= \ frameworks/av/media/libstagefright \ @@ -127,7 +127,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation \ - libmedia libmedia_native libgui libcutils libui + libmedia libgui libcutils libui LOCAL_C_INCLUDES:= \ frameworks/av/media/libstagefright \ @@ -151,7 +151,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation \ - libmedia libmedia_native libgui libcutils libui + libmedia libgui libcutils libui LOCAL_C_INCLUDES:= \ frameworks/av/media/libstagefright \ diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 0ed7e6c27b..778c5ac7dc 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -54,7 +54,6 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libgui \ libmedia \ - libmedia_native \ libdrmframework \ libstagefright \ libstagefright_foundation \ diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 54666fb7e4..f2b6441c29 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -54,7 +54,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox libicuuc libexpat \ libcamera_client libstagefright_foundation \ - libgui libdl libaudioutils libmedia_native + libgui libdl libaudioutils LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 5b5ed71900..48f48e450b 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ libgui \ libmedia \ - libmedia_native \ libsonivox \ libstagefright \ libstagefright_foundation \ diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index faa0f315eb..a05670627f 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -78,7 +78,6 @@ 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 2899953372..58c4be4b17 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -31,7 +31,6 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) -# FIXME keep libmedia_native but remove libmedia after split LOCAL_SHARED_LIBRARIES := \ libaudioutils \ libcommon_time_client \ @@ -39,7 +38,6 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder \ libmedia \ - libmedia_native \ libnbaio \ libhardware \ libhardware_legacy \ diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index 801afe93bb..5245983361 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES:= \ libbinder \ libcutils \ libmedia \ - libmedia_native \ libcamera_client \ libgui \ libhardware \ |