commit 30d3f1c4a92f7ed63fb4e3677a609ae4df0ee060
author Naseer Ahmed <naseer@codeaurora.org> Wed Oct 24 20:53:13 2018 -0400
committer Naseer Ahmed <naseer@codeaurora.org> Wed Oct 24 21:03:30 2018 -0400
tree a1085801463c45cabd69aef203060681fca821ff
parent 4373aa7bc5ae7f7651ecb86abcfae668481e4dbd

display: Fix display config version overwrite

Check the availability of the latest version of display config
first, then check older versions if unavailable

Change-Id: I7c4b3bf5295ece9cec323502e8d1365ecef68795
CRs-Fixed: 2338610

common.mk

diff --git a/common.mk b/common.mk
index 82d247f..bb6494a 100644
--- a/common.mk
+++ b/common.mk
@@ -1,20 +1,31 @@
 #Common headers
 display_top := $(call my-dir)
-display_config_version := $(shell \
-    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.1" ];\
-    then echo DISPLAY_CONFIG_1_1; fi)
-display_config_version := $(shell \
-    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.2" ];\
-    then echo DISPLAY_CONFIG_1_2; fi)
-display_config_version := $(shell \
-    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.3" ];\
-    then echo DISPLAY_CONFIG_1_3; fi)
-display_config_version := $(shell \
-    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.4" ];\
-    then echo DISPLAY_CONFIG_1_4; fi)
+
+#Get the highest display config version available
 display_config_version := $(shell \
     if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.5" ];\
     then echo DISPLAY_CONFIG_1_5; fi)
+ifeq ($(display_config_version),)
+display_config_version := $(shell \
+    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.4" ];\
+    then echo DISPLAY_CONFIG_1_4; fi)
+endif
+ifeq ($(display_config_version),)
+display_config_version := $(shell \
+    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.3" ];\
+    then echo DISPLAY_CONFIG_1_3; fi)
+endif
+ifeq ($(display_config_version),)
+display_config_version := $(shell \
+    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.2" ];\
+    then echo DISPLAY_CONFIG_1_2; fi)
+endif
+ifeq ($(display_config_version),)
+display_config_version := $(shell \
+    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.1" ];\
+    then echo DISPLAY_CONFIG_1_1; fi)
+endif
+
 #Common C flags
 common_flags := -Wno-missing-field-initializers
 common_flags += -Wconversion -Wall -Werror -std=c++14