display: add TARGET_PROVIDES_LIBLIGHT

ps1: Initial port to cm-12.0 ps2: Add 8084 and 8226 Change-Id: I9388f3582d74b4b569e2807e4ec6177dc50f38d0
CyanogenMod · Aug 25, 2016 · 03d9bfb · 03d9bfb
1 parent 9a38fe2
commit 03d9bfb
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 7 deletions.
diff --git a/msm8084/Android.mk b/msm8084/Android.mk
@@ -1,6 +1,10 @@
-display-hals := libgralloc libcopybit liblight libvirtual
+display-hals := libgralloc libcopybit libvirtual
 display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
 display-hals += libmemtrack
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+    display-hals += liblight
+endif
+
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))
 else

diff --git a/msm8226/Android.mk b/msm8226/Android.mk
@@ -1,6 +1,10 @@
-display-hals := libgralloc libcopybit liblight libvirtual
+display-hals := libgralloc libcopybit libvirtual
 display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
 display-hals += libmemtrack
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+    display-hals += liblight
+endif
+
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))
 else

diff --git a/msm8909/Android.mk b/msm8909/Android.mk
@@ -1,6 +1,10 @@
-display-hals := libgralloc libgenlock libcopybit liblight
+display-hals := libgralloc libgenlock libcopybit
 display-hals += libhwcomposer liboverlay libqdutils libhdmi libqservice
 display-hals += libmemtrack
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+    display-hals += liblight
+endif
+
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))
 else

diff --git a/msm8960/Android.mk b/msm8960/Android.mk
@@ -1,6 +1,10 @@
-display-hals := libgralloc libgenlock libcopybit liblight
+display-hals := libgralloc libgenlock libcopybit
 display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
 display-hals += libmemtrack
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+    display-hals += liblight
+endif
+
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))
 else

diff --git a/msm8974/Android.mk b/msm8974/Android.mk
@@ -1,6 +1,10 @@
-display-hals := libgralloc libgenlock libcopybit liblight
+display-hals := libgralloc libgenlock libcopybit
 display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice
 display-hals += libmemtrack
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+    display-hals += liblight
+endif
+
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))
 else

diff --git a/msm8994/Android.mk b/msm8994/Android.mk
@@ -1,5 +1,8 @@
-display-hals := libgralloc libcopybit liblight libmemtrack libqservice
+display-hals := libgralloc libcopybit libmemtrack libqservice
 display-hals += libhwcomposer liboverlay libqdutils libhdmi
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+    display-hals += liblight
+endif
 
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))

diff --git a/msm8996/Android.mk b/msm8996/Android.mk
@@ -1,8 +1,11 @@
-display-hals := libgralloc libcopybit liblight libmemtrack libqservice libqdutils
+display-hals := libgralloc libcopybit libmemtrack libqservice libqdutils
 display-hals += hdmi_cec
 
 sdm-libs := sdm/libs
 display-hals += $(sdm-libs)/utils $(sdm-libs)/core $(sdm-libs)/hwc
+ifneq ($(TARGET_PROVIDES_LIBLIGHT),true)
+    display-hals += liblight
+endif
 
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))