commit 464c0c98bd0752ab44f16988b20ff801bc901549
author Paul Keith <javelinanddart@gmail.com> Sat Dec 10 09:30:32 2016 -0600
committer Paul Keith <javelinanddart@gmail.com> Wed Dec 14 10:49:26 2016 -0600
tree 65f7f40239de0f3663c31a20dbdb74330cdebeb2
parent a7a0ecde6374b51be209cd166122ae0a8c5d1259

consumerir: Allow devices to override default configs

* This is cleaner than hacking up makefiles
* This brings us closer to what other hals
  in this repo are doing (e.g. lights, power)
  and this is done following their example
* As a note, haggertk suggested this when we
  added the inital unified hal, but I never
  got around to doing it

Change-Id: I7c911c5afc2b67308d7135b50a4863a6a9480035
Signed-off-by: Paul Keith <javelinanddart@gmail.com>

consumerir/Android.mk

diff --git a/consumerir/Android.mk b/consumerir/Android.mk
index cd8fd38..b5cbcca 100644
--- a/consumerir/Android.mk
+++ b/consumerir/Android.mk
@@ -15,9 +15,15 @@
 # HAL module implementation stored in
 # hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 
+include $(CLEAR_VARS)
+
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
+LOCAL_SRC_FILES := consumerir.c
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+
+LOCAL_SHARED_LIBRARIES := liblog libcutils
 
 ifeq ($(IR_HAL_SUFFIX),)
 IR_HAL_SUFFIX := $(TARGET_BOARD_PLATFORM)
@@ -25,16 +31,6 @@
 
 LOCAL_MODULE := consumerir.$(IR_HAL_SUFFIX)
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := consumerir.c
-LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_MODULE_TAGS := optional
 
-ifeq ($(BOARD_IR_HAS_ONE_FREQ_RANGE),true)
-LOCAL_CFLAGS += -DUSE_ONE_FREQ_RANGE
-endif
-
-ifeq ($(BOARD_USES_MS_IR_SIGNAL),true)
-LOCAL_CFLAGS += -DMS_IR_SIGNAL
-endif
-
 include $(BUILD_SHARED_LIBRARY)