diff options
| author | Jeong-Seok Yang <jseok.yang@samsung.com> | 2011-06-08 20:28:48 +0900 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-06-14 15:05:20 -0700 |
| commit | 114856ae6435997ca4b61fe45417feba6b27e61e (patch) | |
| tree | 619fb9b6b3613a824bf0d88fecf32980568256b1 | |
| parent | 50af4b3f9cc774c7377521679587b6ff6aecf678 (diff) | |
| download | device_samsung_crespo-114856ae6435997ca4b61fe45417feba6b27e61e.zip device_samsung_crespo-114856ae6435997ca4b61fe45417feba6b27e61e.tar.gz device_samsung_crespo-114856ae6435997ca4b61fe45417feba6b27e61e.tar.bz2 | |
libcamera: Change camera.herring.so from camera.s5pc110.so
crespo: libcamera is for only herring not boards what are based
on s5pc110. So the module name is changed to
camera.herring.so from camera.s5pc110.so
Change-Id: Ie2231ecfd4c97dd72fba8258e489f90df27b9f51
Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
| -rw-r--r-- | CleanSpec.mk | 4 | ||||
| -rw-r--r-- | device_base.mk | 2 | ||||
| -rw-r--r-- | libcamera/Android.mk | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 369698e..5f573ef 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -59,3 +59,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/usr/share/ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/PACKAGING/systemimage_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/SHARED_LIBRARIES/libaudio_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/lib/hw/camera.s5pc110.so) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/lib/camera.s5pc110.so) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/SHARED_LIBRARIES/camera.s5pc110_intermediates/LINKED/camera.s5pc110.so) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/symbols/system/lib/hw/camera.s5pc110.so) diff --git a/device_base.mk b/device_base.mk index 879d304..773ada2 100644 --- a/device_base.mk +++ b/device_base.mk @@ -108,7 +108,7 @@ PRODUCT_PACKAGES += \ # Camera PRODUCT_PACKAGES += \ - camera.s5pc110 + camera.herring # audio PRODUCT_PACKAGES += \ diff --git a/libcamera/Android.mk b/libcamera/Android.mk index 8ba100a..1ade091 100644 --- a/libcamera/Android.mk +++ b/libcamera/Android.mk @@ -16,7 +16,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES:= libutils libcutils libbinder liblog libcamera_client libhardware LOCAL_SHARED_LIBRARIES+= libs3cjpeg -LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) +LOCAL_MODULE := camera.herring LOCAL_MODULE_TAGS := optional |