Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: 4325ece2dd am: 149010d01a am: e78e90f1dc
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7250/media/+/1871918
Change-Id: I6486712d641ed92605fd89b903f50e6324b4d5ae
diff --git a/Android.mk b/Android.mk
index 17479e6..da8656f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,12 +8,12 @@
endif #TARGET_USES_QMAA
#Compile these for all targets under QCOM_BOARD_PLATFORMS list.
-ifeq ($(call is-board-platform-in-list, $(QCOM_BOARD_PLATFORMS)),true)
+ifneq (,$(call is-board-platform-in-list2, $(QCOM_BOARD_PLATFORMS)))
include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk
include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk
endif
-ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
+ifneq (,$(call is-board-platform-in-list2, $(MSM_VIDC_TARGET_LIST)))
ifeq ($(VIDC_STUB_HAL),false)
include $(QCOM_MEDIA_ROOT)/libplatformconfig/Android.mk
include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index a99674b..c8b3ae2 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -17,7 +17,7 @@
#===============================================================================
MPEGH_TARGET_LIST := kona lito bengal
-ifeq ($(call is-board-platform-in-list, $(MPEGH_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MPEGH_TARGET_LIST)))
OMXCORE_CFLAGS += -DAUDIO_MPEGH_ENABLED
endif
@@ -95,7 +95,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := liblog libdl libcutils
-ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
+ifneq (,$(call is-board-platform-in-list2, $(MSM_VIDC_TARGET_LIST)))
ifeq ($(VIDC_STUB_HAL),false)
LOCAL_SHARED_LIBRARIES += libplatformconfig
endif
@@ -135,7 +135,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := liblog libdl libcutils
-ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
+ifneq (,$(call is-board-platform-in-list2, $(MSM_VIDC_TARGET_LIST)))
ifeq ($(VIDC_STUB_HAL),false)
LOCAL_SHARED_LIBRARIES += libplatformconfig
endif
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 3182ae0..8aec4e8 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -27,7 +27,7 @@
# KONA_TODO_UPDATE: Disable SW codec for Kona for now
TARGETS_THAT_DONT_NEED_SW_VDEC := msm8226 msm8916 msm8992 msm8996 sdm660 msm8998 msm8909
-ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_HAVE_VENUS_HEVC)),true)
+ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_HAVE_VENUS_HEVC)))
libmm-vdec-def += -DVENUS_HEVC
endif
@@ -49,7 +49,7 @@
libmm-vdec-def += -DANDROID_JELLYBEAN_MR1=1
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)))
libmm-vdec-def += -DMASTER_SIDE_CP
endif
@@ -148,7 +148,7 @@
include $(CLEAR_VARS)
ifneq "$(wildcard $(QCPATH) )" ""
-ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_NEED_SW_VDEC)),true)
+ifeq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_DONT_NEED_SW_VDEC)))
LOCAL_MODULE := libOmxSwVdec
LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 9d34ce6..9e8402b 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -37,7 +37,7 @@
libmm-venc-def += -U_UBWC_
endif
-ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_FLAG_MSM8226)),true)
+ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_USE_FLAG_MSM8226)))
libmm-venc-def += -D_MSM8226_
endif
@@ -47,7 +47,7 @@
libmm-venc-def += -DUSE_NATIVE_HANDLE_SOURCE
-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)))
libmm-venc-def += -DMASTER_SIDE_CP
endif
@@ -70,7 +70,7 @@
libmm-venc-inc += $(TOP)/frameworks/native/libs/arect/include
libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_ROTATION)),true)
+ifeq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_ROTATION)))
libmm-venc-inc += hardware/libhardware/include/hardware
endif
@@ -127,7 +127,7 @@
include $(BUILD_SHARED_LIBRARY)
-ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_NEED_SW_VENC_MPEG4)),true)
+ifeq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_DONT_NEED_SW_VENC_MPEG4)))
# ---------------------------------------------------------------------------------
# Make the Shared library (libOmxSwVencMpeg4)
# ---------------------------------------------------------------------------------
@@ -169,7 +169,7 @@
LOCAL_SHARED_LIBRARIES += libqdMetaData
LOCAL_SHARED_LIBRARIES += libfastcvopt
-ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_ROTATION)),true)
+ifeq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_ROTATION)))
LOCAL_SHARED_LIBRARIES += libui
LOCAL_SHARED_LIBRARIES += libutils
endif
diff --git a/product.mk b/product.mk
index f763856..0fc0212 100644
--- a/product.mk
+++ b/product.mk
@@ -1,6 +1,6 @@
MSM_VIDC_TARGET_LIST := kona lito bengal
-ifeq ($(call is-board-platform-in-list, $(QCOM_BOARD_PLATFORMS)),true)
+ifneq (,$(call is-board-platform-in-list2, $(QCOM_BOARD_PLATFORMS)))
#MM_CORE
MM_CORE := libmm-omxcore
@@ -10,7 +10,7 @@
endif
-ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)), true)
+ifneq (,$(call is-board-platform-in-list2, $(MSM_VIDC_TARGET_LIST)))
MM_VIDEO := ExoplayerDemo
MM_VIDEO += libc2dcolorconvert
