summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorNaseer Ahmed <naseer@codeaurora.org>2013-02-09 08:11:36 -0500
committerNaseer Ahmed <naseer@codeaurora.org>2013-02-09 08:29:49 -0500
commit7421472e5ceb9d820f3fc17fad9ef4f8250c9ac0 (patch)
treecfaad70744fbe75354e59dda707d1c953d2f87d8 /Android.mk
parent3b6d1115ef81a3fa7deec9e74918459c087f3bfa (diff)
downloaddisplay-7421472e5ceb9d820f3fc17fad9ef4f8250c9ac0.tar.gz
display: Reconcile display HALs
Make the display HALs compile with/without the Qualcomm BSP specific features so they can work with pure AOSP. Change-Id: I1ad7282c4fe1fe7e3309afb530a07735f165ffbe
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 1e8cddac..b62e45bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,10 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
-
display-hals := libgralloc libgenlock libcopybit liblight
display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
-
-include $(call all-named-subdir-makefiles,$(display-hals))
+ifeq ($(call is-vendor-board-platform,QCOM),true)
+ include $(call all-named-subdir-makefiles,$(display-hals))
+else
+ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)
+ #This is for mako since it doesn't have the QCOM make functions
+ include $(call all-named-subdir-makefiles,$(display-hals))
+endif
endif