commit 0549a74abc1babb7e827c3ad65aa4f71190d993b
author Steve Paik <spaik@google.com> Wed Jul 15 16:49:25 2015 -0700
committer Rakesh Iyer <rni@google.com> Thu Nov 12 11:26:55 2015 -0800
tree 995a9f2e9cd0429979e5f27bba4dded512196bb0
parent a3ea49c1c2d77ab814d35a13fb098d9a2873a28b

Workaround for adp8064

This is a squash of I8cf6e23c0a2944c999add6c96fc8f2162fc06f52
and I81bf680a1847ba967e44f6d590f08bd278fc7a88.

Change-Id: Id846e6fe314c440e7d082452883e8ca504ee13d6

Android.mk

diff --git a/Android.mk b/Android.mk
index 1e26411..ab0ad17 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,14 +1,16 @@
-ifneq ($(filter msm8960 msm8226 msm8x26 msm8974 msm8x74 msm8x84 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),)
+# TODO:  Find a better way to separate build configs for ADP vs non-ADP devices
+ifneq ($(TARGET_BOARD_AUTO),true)
+  ifneq ($(filter msm8960 msm8226 msm8x26 msm8974 msm8x74 msm8x84 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),)
 
-MY_LOCAL_PATH := $(call my-dir)
+    MY_LOCAL_PATH := $(call my-dir)
 
-ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
-include $(MY_LOCAL_PATH)/legacy/Android.mk
-else
-include $(MY_LOCAL_PATH)/hal/Android.mk
-include $(MY_LOCAL_PATH)/voice_processing/Android.mk
-include $(MY_LOCAL_PATH)/visualizer/Android.mk
-include $(MY_LOCAL_PATH)/post_proc/Android.mk
-endif
-
+    ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
+      include $(MY_LOCAL_PATH)/legacy/Android.mk
+    else
+      include $(MY_LOCAL_PATH)/hal/Android.mk
+      include $(MY_LOCAL_PATH)/voice_processing/Android.mk
+      include $(MY_LOCAL_PATH)/visualizer/Android.mk
+      include $(MY_LOCAL_PATH)/post_proc/Android.mk
+    endif
+  endif
 endif