Permalink
Browse files

we need not only the static but also the shared libcamera_client and …

…libsurfaceflinger_client for the proprietary libvendorOMX_ti_omx...
  • Loading branch information...
nadlabak committed Sep 28, 2010
1 parent 1a25eee commit 6779377ae245d7475ee06ac515b0322279023407
Showing with 28 additions and 9 deletions.
  1. +13 −4 libs/camera/Android.mk
  2. +15 −5 libs/surfaceflinger_client/Android.mk
View
@@ -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
@@ -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,24 +15,31 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE:= libsurfaceflinger_client
ifneq ($(BOARD_USES_ECLAIR_LIBCAMERA),true)
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libbinder \
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

0 comments on commit 6779377

Please sign in to comment.