diff options
-rw-r--r-- | camera/Android.mk | 1 | ||||
-rw-r--r-- | cmds/stagefright/Android.mk | 6 | ||||
-rw-r--r-- | media/libmedia/Android.mk | 2 | ||||
-rw-r--r-- | media/libmediaplayerservice/Android.mk | 3 | ||||
-rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
-rw-r--r-- | services/camera/libcameraservice/Android.mk | 1 | ||||
-rw-r--r-- | services/camera/tests/CameraServiceTest/Android.mk | 2 |
7 files changed, 6 insertions, 10 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 2f16923..b17b3d2 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -13,7 +13,6 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder \ libhardware \ - libsurfaceflinger_client \ libui \ libgui diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 1b13dd9..e9642f7 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright libmedia libutils libbinder libstagefright_foundation \ - libskia libsurfaceflinger_client libgui + libskia libgui LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ @@ -107,7 +107,7 @@ LOCAL_SRC_FILES:= \ stream.cpp \ LOCAL_SHARED_LIBRARIES := \ - libstagefright liblog libutils libbinder libsurfaceflinger_client \ + libstagefright liblog libutils libbinder libgui \ libstagefright_foundation libmedia LOCAL_C_INCLUDES:= \ @@ -132,7 +132,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation \ - libmedia libsurfaceflinger_client libcutils libui + libmedia libgui libcutils libui LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index a04fbd2..ca7441a 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -38,7 +38,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox libicuuc libexpat \ - libsurfaceflinger_client libcamera_client libstagefright_foundation \ + libcamera_client libstagefright_foundation \ libgui LOCAL_MODULE:= libmedia diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index e65f6d8..fadad28 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -31,8 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libstagefright \ libstagefright_omx \ - libstagefright_foundation \ - libsurfaceflinger_client \ + libstagefright_foundation \ libgui LOCAL_STATIC_LIBRARIES := \ diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index e445b74..d2e8b46 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -70,7 +70,6 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libsonivox \ libvorbisidec \ - libsurfaceflinger_client \ libstagefright_yuv \ libcamera_client \ libdrmframework \ diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index b52fc69..14f1e8b 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -49,7 +49,6 @@ LOCAL_SHARED_LIBRARIES:= \ libcutils \ libmedia \ libcamera_client \ - libsurfaceflinger_client \ libgui LOCAL_MODULE:= libcameraservice diff --git a/services/camera/tests/CameraServiceTest/Android.mk b/services/camera/tests/CameraServiceTest/Android.mk index cf4e42f..cf7302a 100644 --- a/services/camera/tests/CameraServiceTest/Android.mk +++ b/services/camera/tests/CameraServiceTest/Android.mk @@ -19,7 +19,7 @@ LOCAL_SHARED_LIBRARIES += \ libutils \ libui \ libcamera_client \ - libsurfaceflinger_client + libgui # Disable it because the ISurface interface may change, and before we have a # chance to fix this test, we don't want to break normal builds. |