Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master"
diff --git a/device.mk b/device.mk
index b8e19ee..1af567b 100755
--- a/device.mk
+++ b/device.mk
@@ -335,10 +335,13 @@
# Light HAL
PRODUCT_PACKAGES += \
- lights.$(PRODUCT_HARDWARE) \
+ lights.wahoo \
android.hardware.light@2.0-impl:64 \
android.hardware.light@2.0-service
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.hardware.lights=wahoo
+
# eSE applet HALs
PRODUCT_PACKAGES += \
esed
diff --git a/liblight/Android.mk b/liblight/Android.mk
index 2ffa693..bf309b1 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -25,7 +25,7 @@
-DLOG_TAG=\"qdlights\" \
-DDEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS=$(DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS)
LOCAL_CFLAGS += -Wall -Werror
-LOCAL_MODULE := lights.$(TARGET_DEVICE)
+LOCAL_MODULE := lights.wahoo
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)