Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2" am: 1bec2aa709 am: bc59b5092c am: 67e514d96a am: 02f76f3340 am: 236a904f69
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1871916
Change-Id: Ibe67e42bf1dec4df761ec6b05c5d03285a593f79
diff --git a/msm8084/libcopybit/Android.mk b/msm8084/libcopybit/Android.mk
index 4eaaca1..3cd8c50 100644
--- a/msm8084/libcopybit/Android.mk
+++ b/msm8084/libcopybit/Android.mk
@@ -39,12 +39,12 @@
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
- ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ ifneq (,$(call is-board-platform-in-list2,$(MSM7K_BOARD_PLATFORMS)))
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
- ifeq ($(call is-board-platform-in-list,msm8610),true)
+ ifneq (,$(call is-board-platform-in-list2,msm8610))
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/msm8226/common.mk b/msm8226/common.mk
index 887c2a3..ab4b8eb 100644
--- a/msm8226/common.mk
+++ b/msm8226/common.mk
@@ -27,8 +27,7 @@
common_flags += -D__ARM_HAVE_NEON
endif
-ifeq ($(call is-board-platform-in-list, msm8974 msm8226 msm8610 apq8084 \
- mpq8092 msm_bronze msm8916 msm8994), true)
+ifneq (,$(call is-board-platform-in-list2, msm8974 msm8226 msm8610 apq8084 mpq8092 msm_bronze msm8916 msm8994))
common_flags += -DVENUS_COLOR_FORMAT
common_flags += -DMDSS_TARGET
endif
diff --git a/msm8226/libcopybit/Android.mk b/msm8226/libcopybit/Android.mk
index 6f6b5a0..4c25f03 100644
--- a/msm8226/libcopybit/Android.mk
+++ b/msm8226/libcopybit/Android.mk
@@ -39,12 +39,12 @@
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
- ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ ifneq (,$(call is-board-platform-in-list2,$(MSM7K_BOARD_PLATFORMS)))
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
- ifeq ($(call is-board-platform-in-list,msm8610),true)
+ ifneq (,$(call is-board-platform-in-list2,msm8610))
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/msm8909/common.mk b/msm8909/common.mk
index 2a78aad..c856a4f 100644
--- a/msm8909/common.mk
+++ b/msm8909/common.mk
@@ -28,7 +28,7 @@
common_flags += -D__ARM_HAVE_NEON
endif
-ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MASTER_SIDE_CP_TARGET_LIST)))
common_flags += -DMASTER_SIDE_CP
endif
diff --git a/msm8909/libcopybit/Android.mk b/msm8909/libcopybit/Android.mk
index 7b6a47b..ef50ed1 100644
--- a/msm8909/libcopybit/Android.mk
+++ b/msm8909/libcopybit/Android.mk
@@ -43,12 +43,12 @@
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
- ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ ifneq (,$(call is-board-platform-in-list2,$(MSM7K_BOARD_PLATFORMS)))
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
- ifeq ($(call is-board-platform-in-list, msm8610 msm8909),true)
+ ifneq (,$(call is-board-platform-in-list2, msm8610 msm8909))
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/msm8909w_3100/common.mk b/msm8909w_3100/common.mk
index 8920342..7e46c20 100644
--- a/msm8909w_3100/common.mk
+++ b/msm8909w_3100/common.mk
@@ -21,7 +21,7 @@
common_flags += -D__ARM_HAVE_NEON
endif
-ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MASTER_SIDE_CP_TARGET_LIST)))
common_flags += -DMASTER_SIDE_CP
endif
diff --git a/msm8909w_3100/libcopybit/Android.mk b/msm8909w_3100/libcopybit/Android.mk
index 338098c..979dd8a 100644
--- a/msm8909w_3100/libcopybit/Android.mk
+++ b/msm8909w_3100/libcopybit/Android.mk
@@ -42,12 +42,12 @@
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
- ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ ifneq (,$(call is-board-platform-in-list2,$(MSM7K_BOARD_PLATFORMS)))
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
- ifeq ($(call is-board-platform-in-list, msm8610 msm8909),true)
+ ifneq (,$(call is-board-platform-in-list2, msm8610 msm8909))
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/msm8960/libcopybit/Android.mk b/msm8960/libcopybit/Android.mk
index a213919..b30e977 100644
--- a/msm8960/libcopybit/Android.mk
+++ b/msm8960/libcopybit/Android.mk
@@ -39,7 +39,7 @@
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
- ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ ifneq (,$(call is-board-platform-in-list2,$(MSM7K_BOARD_PLATFORMS)))
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
diff --git a/msm8994/libcopybit/Android.mk b/msm8994/libcopybit/Android.mk
index f36b50d..f05eea4 100644
--- a/msm8994/libcopybit/Android.mk
+++ b/msm8994/libcopybit/Android.mk
@@ -42,12 +42,12 @@
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
- ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ ifneq (,$(call is-board-platform-in-list2,$(MSM7K_BOARD_PLATFORMS)))
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
- ifeq ($(call is-board-platform-in-list, msm8610 msm8909),true)
+ ifneq (,$(call is-board-platform-in-list2, msm8610 msm8909))
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/msm8996/common.mk b/msm8996/common.mk
index 1dd17eb..ac8828d 100644
--- a/msm8996/common.mk
+++ b/msm8996/common.mk
@@ -41,11 +41,11 @@
common_flags += -D__ARM_HAVE_NEON
endif
-ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MSM_VIDC_TARGET_LIST)))
common_flags += -DVENUS_COLOR_FORMAT
endif
-ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MASTER_SIDE_CP_TARGET_LIST)))
common_flags += -DMASTER_SIDE_CP
endif
diff --git a/msm8996/libcopybit/Android.mk b/msm8996/libcopybit/Android.mk
index c525399..f16f95d 100644
--- a/msm8996/libcopybit/Android.mk
+++ b/msm8996/libcopybit/Android.mk
@@ -44,12 +44,12 @@
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
- ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ ifneq (,$(call is-board-platform-in-list2,$(MSM7K_BOARD_PLATFORMS)))
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
- ifeq ($(call is-board-platform-in-list, msm8610 msm8909),true)
+ ifneq (,$(call is-board-platform-in-list2, msm8610 msm8909))
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/msm8998/common.mk b/msm8998/common.mk
index 8feeb9a..abd19dd 100644
--- a/msm8998/common.mk
+++ b/msm8998/common.mk
@@ -24,7 +24,7 @@
common_flags += -D__ARM_HAVE_NEON
endif
-ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MASTER_SIDE_CP_TARGET_LIST)))
common_flags += -DMASTER_SIDE_CP
endif
