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 /services | |
| parent | 670d4b7520bca8c6b3c59db2640698358d83aca6 (diff) | |
| parent | c41590251aa84c078c942d258e838aad814b73a5 (diff) | |
| download | frameworks_av-b7d55a839356ad55316b5dd5b83396b69d391ce3.zip frameworks_av-b7d55a839356ad55316b5dd5b83396b69d391ce3.tar.gz frameworks_av-b7d55a839356ad55316b5dd5b83396b69d391ce3.tar.bz2 | |
Merge "Remove obsolete references to libmedia_native"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Android.mk | 2 | ||||
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 2899953..58c4be4 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 801afe9..5245983 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 \ |