summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2021-10-21 14:24:16 -0700
committerAlexander Smundak <asmundak@google.com>2021-10-28 21:52:50 +0000
commit5ca67f5db4a95f7c75f167057cbab9b15470c1ec (patch)
treecfb669013e8017c4b820903d24f1015bbf9ef321
parentb9bbe00d6af30849616b85b135512301ea9b61f2 (diff)
downloaddisplay-5ca67f5db4a95f7c75f167057cbab9b15470c1ec.tar.gz
Replace is-board-platform[-in-list] with is-board-platform[-in-list]2
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` declare -r files="$(grep -rlP '^[^#]*call +is-board-platform' --include '*.mk' --exclude 'utils_test.mk' --exclude 'utils_sample_usage.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq +\(\$\(call is-board-platform,(.*)\), *true\)/ifneq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform,(.*)\), *\)/ifeq (,$(call is-board-platform2,\1))/ s/ifneq +\(\$\(call is-board-platform,(.*)\), *true\)/ifeq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifneq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *false\)/ifeq (,T) # TODO: remove useless check/ s/ifneq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/\$\(call is-board-platform,(.*)\)/$(call is-board-platform2,\1)/ EOF ) $files ``` There was additional manual change in msm8226/common.mk (the sccipt cannot handle continuation lines). Change-Id: Id100bea2a75f42f95fb11e632e59d3c50e2b16f3
-rw-r--r--msm8084/libcopybit/Android.mk4
-rw-r--r--msm8226/common.mk3
-rw-r--r--msm8226/libcopybit/Android.mk4
-rw-r--r--msm8909/common.mk2
-rw-r--r--msm8909/libcopybit/Android.mk4
-rw-r--r--msm8909w_3100/common.mk2
-rw-r--r--msm8909w_3100/libcopybit/Android.mk4
-rw-r--r--msm8960/libcopybit/Android.mk2
-rw-r--r--msm8994/libcopybit/Android.mk4
-rw-r--r--msm8996/common.mk4
-rw-r--r--msm8996/libcopybit/Android.mk4
-rw-r--r--msm8998/common.mk2
12 files changed, 19 insertions, 20 deletions
diff --git a/msm8084/libcopybit/Android.mk b/msm8084/libcopybit/Android.mk
index 4eaaca18..3cd8c504 100644
--- a/msm8084/libcopybit/Android.mk
+++ b/msm8084/libcopybit/Android.mk
@@ -39,12 +39,12 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
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 887c2a3e..ab4b8eb2 100644
--- a/msm8226/common.mk
+++ b/msm8226/common.mk
@@ -27,8 +27,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true)
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 6f6b5a03..4c25f038 100644
--- a/msm8226/libcopybit/Android.mk
+++ b/msm8226/libcopybit/Android.mk
@@ -39,12 +39,12 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
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 2a78aad0..c856a4f8 100644
--- a/msm8909/common.mk
+++ b/msm8909/common.mk
@@ -28,7 +28,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true)
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 7b6a47b5..ef50ed16 100644
--- a/msm8909/libcopybit/Android.mk
+++ b/msm8909/libcopybit/Android.mk
@@ -43,12 +43,12 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
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 8920342b..7e46c203 100644
--- a/msm8909w_3100/common.mk
+++ b/msm8909w_3100/common.mk
@@ -21,7 +21,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true)
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 338098c4..979dd8aa 100644
--- a/msm8909w_3100/libcopybit/Android.mk
+++ b/msm8909w_3100/libcopybit/Android.mk
@@ -42,12 +42,12 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
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 a2139196..b30e977d 100644
--- a/msm8960/libcopybit/Android.mk
+++ b/msm8960/libcopybit/Android.mk
@@ -39,7 +39,7 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
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 f36b50d1..f05eea47 100644
--- a/msm8994/libcopybit/Android.mk
+++ b/msm8994/libcopybit/Android.mk
@@ -42,12 +42,12 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
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 1dd17eb4..ac8828df 100644
--- a/msm8996/common.mk
+++ b/msm8996/common.mk
@@ -41,11 +41,11 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true)
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 c525399e..f16f95d8 100644
--- a/msm8996/libcopybit/Android.mk
+++ b/msm8996/libcopybit/Android.mk
@@ -44,12 +44,12 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
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 8feeb9a5..abd19ddf 100644
--- a/msm8998/common.mk
+++ b/msm8998/common.mk
@@ -24,7 +24,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true)
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