diff options
| author | Koushik Dutta <koushd@gmail.com> | 2010-07-11 23:05:00 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2010-07-11 23:05:00 -0700 |
| commit | 8e309093776b259a23077feb095aee082f68a2f8 (patch) | |
| tree | f3972b034fa3868cbaac011cb855973f376e494a /camera | |
| parent | 39a5d188dd20bdebee7a1da4e1f57455739c016f (diff) | |
| download | frameworks_base-8e309093776b259a23077feb095aee082f68a2f8.zip frameworks_base-8e309093776b259a23077feb095aee082f68a2f8.tar.gz frameworks_base-8e309093776b259a23077feb095aee082f68a2f8.tar.bz2 | |
Remerge libui.so, libsurfaceflinger_client.so, and libcamera_client.so for older devices.
Change-Id: I6a1dbe519df3b07292d738ffa9f6be95b794875e
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/libcameraservice/Android.mk | 10 | ||||
| -rw-r--r-- | camera/tests/CameraServiceTest/Android.mk | 12 |
2 files changed, 15 insertions, 7 deletions
diff --git a/camera/libcameraservice/Android.mk b/camera/libcameraservice/Android.mk index df5c166..4430541 100644 --- a/camera/libcameraservice/Android.mk +++ b/camera/libcameraservice/Android.mk @@ -48,9 +48,13 @@ LOCAL_SHARED_LIBRARIES:= \ libutils \ libbinder \ libcutils \ - libmedia \ - libcamera_client \ - libsurfaceflinger_client + libmedia + +ifneq ($(BOARD_USES_ECLAIR_LIBCAMERA),true) + LOCAL_SHARED_LIBRARIES += \ + libsurfaceflinger_client \ + libcamera_client +endif LOCAL_MODULE:= libcameraservice diff --git a/camera/tests/CameraServiceTest/Android.mk b/camera/tests/CameraServiceTest/Android.mk index 9bb190a..5bacb30 100644 --- a/camera/tests/CameraServiceTest/Android.mk +++ b/camera/tests/CameraServiceTest/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES:= CameraServiceTest.cpp LOCAL_MODULE:= CameraServiceTest -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := eng tests LOCAL_C_INCLUDES += \ frameworks/base/libs @@ -17,8 +17,12 @@ LOCAL_SHARED_LIBRARIES += \ libbinder \ libcutils \ libutils \ - libui \ - libcamera_client \ - libsurfaceflinger_client + libui + +ifneq ($(BOARD_USES_ECLAIR_LIBCAMERA),true) + LOCAL_SHARED_LIBRARIES += \ + libcamera_client \ + libsurfaceflinger_client +endif include $(BUILD_EXECUTABLE) |