summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2016-02-03 15:57:24 -0800
committerPrashant Malani <pmalani@google.com>2016-02-03 15:57:24 -0800
commit77239a181641dd9a182246a48920f30a5f3056c5 (patch)
tree028f50881aea989606fa81f515fa28e8c6d5035e /Android.mk
parent665586e341eb1643b1e17cd8027fa16b6395f0da (diff)
parent14231e3c5752b60075d57f6b16ecadd34b86830e (diff)
downloadbt-77239a181641dd9a182246a48920f30a5f3056c5.tar.gz
resolve merge conflicts of 14231e3c57 to master.
Change-Id: I5333f649b7d3f3142846c33be55d6e4735a090d1
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 646e61b..afee132 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,11 @@ ifneq ($(TARGET_BOARD_AUTO),true)
else
ifneq ($(filter msm8994 msm8992,$(TARGET_BOARD_PLATFORM)),)
include $(call all-named-subdir-makefiles,msm8992)
+ else
+ ifneq ($(filter msm8909 ,$(TARGET_BOARD_PLATFORM)),)
+ #For msm8909 target
+ include $(call all-named-subdir-makefiles,msm8909)
+ endif
endif
endif
endif