From 06f7dd0a4bb0eb6bee2dff11493e7417354fc78e Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 6 Feb 2020 09:30:35 -0800 Subject: [PATCH] Stop using $(TARGET_DEVICE) in module names See: https://android.googlesource.com/platform/build/soong/+/master/docs/best_practices.md#module-with-name-based-on-variable Bug: 122333321 Bug: 148986460 Test: treehugger Change-Id: I68f596ebd09cc81108ad32b195677ad56b8a0653 --- device.mk | 5 ++++- liblight/Android.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 4ddc38c1..a41010e4 100755 --- a/device.mk +++ b/device.mk @@ -335,10 +335,13 @@ PRODUCT_PACKAGES += \ # 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 2ffa693c..bf309b16 100644 --- a/liblight/Android.mk +++ b/liblight/Android.mk @@ -25,7 +25,7 @@ LOCAL_CFLAGS := $(common_flags) \ -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)