Separate MSM8960 and MSM8974 wrapper

BoardConfig.mk

@@ -94,8 +94,8 @@ WIFI_DRIVER_FW_PATH_P2P     :=
 
 # Don't use qcom camera HAL
 #USE_DEVICE_SPECIFIC_CAMERA := true
-
-COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE
+TARGET_PROVIDES_CAMERA_HAL_MSM8974 := true
+TARGET_PROVIDES_CAMERA_HAL := 
 
 # Build lights 
 TARGET_PROVIDES_LIBLIGHT := true

camera/Android.mk

@@ -1,4 +1,4 @@
-ifeq ($(TARGET_PROVIDES_CAMERA_HAL),true)
+ifeq ($(TARGET_PROVIDES_CAMERA_HAL_MSM8974),true)
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)

camera/CameraWrapper.cpp

@@ -57,7 +57,7 @@ camera_module_t HAL_MODULE_INFO_SYM = {
          version_major: 1,
          version_minor: 0,
          id: CAMERA_HARDWARE_MODULE_ID,
-         name: "Hlte Camera Wrapper",
+         name: "Klte Camera Wrapper",
          author: "The CyanogenMod Project",
          methods: &camera_module_methods,
          dso: NULL, /* remove compilation warnings */