commit a5e56961065e0fd224a1abbb2d79eb7e6cf60cae
author Linux Build Service Account <lnxbuild@localhost> Mon Dec 16 07:32:55 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Dec 16 07:32:55 2013 -0800
tree ca2fcf279ff97ffff74ac5bc202be3caa6eb449f
parent 217d13d14386ed05f8335b50f3427550336f377d
parent 10cd49e0fce9384c57f5bdc600cc7e124c1132ef

Merge "display: Add display HAL support for msm8916."

common.mk

diff --git a/common.mk b/common.mk
index cfe84be..47c455f 100644
--- a/common.mk
+++ b/common.mk
@@ -31,12 +31,12 @@
 endif
 
 ifeq ($(call is-board-platform-in-list, msm8974 msm8226 msm8610 apq8084 \
-        mpq8092 msm_bronze), true)
+        mpq8092 msm_bronze msm8916), true)
     common_flags += -DVENUS_COLOR_FORMAT
     common_flags += -DMDSS_TARGET
 endif
 
-ifeq ($(call is-board-platform-in-list, mpq8092 msm_bronze), true)
+ifeq ($(call is-board-platform-in-list, mpq8092 msm_bronze msm8916), true)
     #XXX: Replace with check from MDP when available
     common_flags += -DVPU_TARGET
 endif

libhwcomposer/Android.mk

diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index 4ef4286..7b2092d 100644
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -25,7 +25,7 @@
                                  hwc_dump_layers.cpp \
                                  hwc_ad.cpp
 
-ifeq ($(call is-board-platform-in-list, mpq8092 msm_bronze), true)
+ifeq ($(call is-board-platform-in-list, mpq8092 msm_bronze msm8916), true)
     LOCAL_SRC_FILES += hwc_vpuclient.cpp
 endif