Permalink
Browse files

camera: prioritize HAL3.0 over HAL1.0

Change-Id: Id0c77ef083ad4f88ecbd8b7b1d661453df4d5b3f
Signed-off-by: Iliyan Malchev <malchev@google.com>
  • Loading branch information...
1 parent c8d7d91 commit 5758ba27cc995e4a572e07b55c575384c8bd049d Iliyan Malchev committed May 8, 2013
Showing with 5 additions and 4 deletions.
  1. +1 −0 CleanSpec.mk
  2. +2 −2 QCamera2/HAL/Android.mk
  3. +2 −2 QCamera2/HAL3/Android.mk
View
@@ -45,3 +45,4 @@
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
$(call add-clean-step, find $(OUT_DIR) -name "camera.msm8960*" -print0 | xargs -0 rm -rf)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/hw/camera.*.so)
View
@@ -34,8 +34,8 @@ LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils
LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-#LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
-LOCAL_MODULE := camera.$(TARGET_DEVICE)
+LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
+#LOCAL_MODULE := camera.$(TARGET_DEVICE)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
View
@@ -33,8 +33,8 @@ LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils
LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
-#LOCAL_MODULE := camera3.$(TARGET_DEVICE)
+#LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE := camera3.$(TARGET_DEVICE)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)

0 comments on commit 5758ba2

Please sign in to comment.