summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Paik <spaik@google.com>2015-07-15 16:52:17 -0700
committerRakesh Iyer <rni@google.com>2015-11-12 11:29:43 -0800
commit3a098ee1f89c398b9d6e7b5dfae9c694994f8bc4 (patch)
treeff8c16ea1031315588f50260f0f32f6043325101
parentff9f4538c09399030fa73e3e65a167852cb91e8f (diff)
downloadandroid_hardware_qcom_power-staging/cm-14.0.tar.gz
android_hardware_qcom_power-staging/cm-14.0.tar.bz2
android_hardware_qcom_power-staging/cm-14.0.zip
Workaround for adp8064staging/cm-14.0
This is a squash of I78e107c763e9969b0d6e0b31fad806be4079e23b and I71ed35d1900ef48d731ed744ed545135445040ac Change-Id: I4143021ecb3530fa618ae259b2206d5b5eb93aeb
-rw-r--r--Android.mk27
1 files changed, 15 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index 7040ef1..1eb4381 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,17 +1,20 @@
-ifneq ($(filter msm8960 msm8974,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_PATH := $(call my-dir)
+# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
+ifneq ($(TARGET_BOARD_AUTO),true)
+ ifneq ($(filter msm8960 msm8974,$(TARGET_BOARD_PLATFORM)),)
+ LOCAL_PATH := $(call my-dir)
-# HAL module implemenation stored in
-# hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
-include $(CLEAR_VARS)
+ # HAL module implemenation stored in
+ # hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
+ include $(CLEAR_VARS)
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
-LOCAL_SRC_FILES := \
- power.c \
+ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+ LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
+ LOCAL_SRC_FILES := \
+ power.c \
-LOCAL_MODULE:= power.$(TARGET_BOARD_PLATFORM)
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SHARED_LIBRARY)
+ LOCAL_MODULE:= power.$(TARGET_BOARD_PLATFORM)
+ LOCAL_MODULE_TAGS := optional
+ include $(BUILD_SHARED_LIBRARY)
+ endif
endif