LineageOS/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2" am: 1bec2aa709 am: bc59b5092c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1871916

Change-Id: Ib1d337c3ffdad76e975bf46d6458599b007db472
This commit is contained in:
Treehugger Robot
2021-11-04 17:35:10 +00:00
committed by Automerger Merge Worker
parent beb833f5f5 bc59b5092c
commit 67e514d96a
12 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm8084/libcopybit/Android.mk
View File

@@ -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

3
msm8226/common.mk
View File

@@ -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

4
msm8226/libcopybit/Android.mk
View File

@@ -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

2
msm8909/common.mk
View File

@@ -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

4
msm8909/libcopybit/Android.mk
View File

@@ -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

2
msm8909w_3100/common.mk
View File

@@ -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

4
msm8909w_3100/libcopybit/Android.mk
View File

@@ -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

2
msm8960/libcopybit/Android.mk
View File

@@ -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)

4
msm8994/libcopybit/Android.mk
View File

@@ -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

4
msm8996/common.mk
View File

@@ -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

4
msm8996/libcopybit/Android.mk
View File

@@ -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

2
msm8998/common.mk
View File

@@ -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