Skip to content

Commit

Permalink
Merge "Replace is-board-platform[-in-list] with is-board-platform[-in…
Browse files Browse the repository at this point in the history 
…-list]2" am: 1bec2aa am: bc59b50

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

Change-Id: Ib1d337c3ffdad76e975bf46d6458599b007db472
  • Loading branch information
@android-build-merge-worker-robot
Treehugger Robot authored and android-build-merge-worker-robot committed Nov 4, 2021
2 parents beb833f + bc59b50 commit 67e514d
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 20 deletions.
4 changes: 2 additions & 2 deletions msm8084/libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions msm8226/common.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions msm8226/libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion msm8909/common.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions msm8909/libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion msm8909w_3100/common.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions msm8909w_3100/libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion msm8960/libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions msm8994/libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions msm8996/common.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions msm8996/libcopybit/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion msm8998/common.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 67e514d

Please sign in to comment.