diff --git a/libs/camera/Android.mk b/libs/camera/Android.mk
index 3691bdea3bb96..4d36fedaa45f3 100644
--- a/libs/camera/Android.mk
+++ b/libs/camera/Android.mk
@@ -1,6 +1,9 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+# although we use BOARD_USES_ECLAIR_LIBCAMERA (so we make it static), we also need
+# the shared libcamera_client and libsurfaceflinger_client for libvendorOMX_ti_omx...
+
 LOCAL_SRC_FILES:= \
 	Camera.cpp \
 	CameraParameters.cpp \
@@ -10,8 +13,6 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_MODULE:= libcamera_client
 
-ifneq ($(BOARD_USES_ECLAIR_LIBCAMERA),true)
-
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	libutils \
@@ -26,8 +27,16 @@ endif
 
 include $(BUILD_SHARED_LIBRARY)
 
-else
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= \
+	Camera.cpp \
+	CameraParameters.cpp \
+	ICamera.cpp \
+	ICameraClient.cpp \
+	ICameraService.cpp
+
+LOCAL_MODULE:= libcamera_client
 
 include $(BUILD_STATIC_LIBRARY)
 
-endif
diff --git a/libs/surfaceflinger_client/Android.mk b/libs/surfaceflinger_client/Android.mk
index 53682808b60b2..b67afd63dbca6 100644
--- a/libs/surfaceflinger_client/Android.mk
+++ b/libs/surfaceflinger_client/Android.mk
@@ -1,6 +1,9 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+# although we use BOARD_USES_ECLAIR_LIBCAMERA (so we make it static), we also need
+# the shared libcamera_client and libsurfaceflinger_client for libvendorOMX_ti_omx...
+
 LOCAL_SRC_FILES:= \
 	ISurfaceComposer.cpp \
 	ISurface.cpp \
@@ -12,8 +15,6 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_MODULE:= libsurfaceflinger_client
 
-ifneq ($(BOARD_USES_ECLAIR_LIBCAMERA),true)
-
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	libutils \
@@ -21,15 +22,24 @@ LOCAL_SHARED_LIBRARIES := \
 	libhardware \
 	libui
 
-
 ifeq ($(TARGET_SIMULATOR),true)
     LOCAL_LDLIBS += -lpthread
 endif
 
 include $(BUILD_SHARED_LIBRARY)
 
-else
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= \
+	ISurfaceComposer.cpp \
+	ISurface.cpp \
+	ISurfaceFlingerClient.cpp \
+	LayerState.cpp \
+	SharedBufferStack.cpp \
+	Surface.cpp \
+	SurfaceComposerClient.cpp
+
+LOCAL_MODULE:= libsurfaceflinger_client
 
 include $(BUILD_STATIC_LIBRARY)
 
-endif