diff options
author | Sasha Smundak <asmundak@google.com> | 2021-11-05 17:08:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-05 17:08:24 +0000 |
commit | a3c81c63185c1ad5f467deddf5d9076fc68c585c (patch) | |
tree | 5e9338079676d40e218193c1a567b6a54145e9cd | |
parent | 71940a0e3b2243b1bdd25313284091e4cb8327c9 (diff) | |
parent | 9058a418bdb6f386b65fc6f83c57af872c2a9e5b (diff) | |
download | media-a3c81c63185c1ad5f467deddf5d9076fc68c585c.tar.gz |
Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: b06283cbf2 am: 2f65600922 am: 9058a418bd
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1871919
Change-Id: Ie65e78766450187f8ca8ea3c957799a5c82d9c7e
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | mm-core/Android.mk | 4 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 6 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 14 | ||||
-rw-r--r-- | product.mk | 6 |
5 files changed, 17 insertions, 17 deletions
@@ -1,12 +1,12 @@ QCOM_MEDIA_ROOT := $(call my-dir) #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))) include $(QCOM_MEDIA_ROOT)/libplatformconfig/Android.mk include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk diff --git a/mm-core/Android.mk b/mm-core/Android.mk index 6dc01ab9..caa89b1c 100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -82,7 +82,7 @@ LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE 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))) LOCAL_SHARED_LIBRARIES += libplatformconfig endif LOCAL_CFLAGS := $(OMXCORE_CFLAGS) @@ -120,7 +120,7 @@ LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE 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))) LOCAL_SHARED_LIBRARIES += libplatformconfig endif LOCAL_CFLAGS := $(OMXCORE_CFLAGS) diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index d7b37b65..c5db1544 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -29,7 +29,7 @@ libmm-vdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT TARGETS_THAT_HAVE_VENUS_HEVC := apq8084 msm8994 msm8996 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 @@ -47,7 +47,7 @@ ifneq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 18 ))" ))) 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 @@ -144,7 +144,7 @@ include $(BUILD_SHARED_LIBRARY) 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 42c3ca33..66de9248 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -31,7 +31,7 @@ TARGETS_THAT_DONT_SUPPORT_SW_VENC_720P = atoll TARGETS_THAT_NEED_SW_VENC_HEVC := msm8992 TARGETS_THAT_SUPPORT_VQZIP := msm8996 msm8998 -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_720P)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_720P))) libmm-venc-def += -DDISABLE_720P endif @@ -41,11 +41,11 @@ endif libmm-venc-def += -D_UBWC_ -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_VQZIP)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_VQZIP))) libmm-venc-def += -D_VQZIP_ 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 @@ -55,7 +55,7 @@ endif 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 @@ -84,7 +84,7 @@ ifeq ($(ENABLE_HYP),true) libmm-venc-inc += hardware/qcom/media/hypv-intercept endif -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 @@ -138,7 +138,7 @@ LOCAL_CFLAGS += -Wno-error=implicit-fallthrough 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) # --------------------------------------------------------------------------------- @@ -172,7 +172,7 @@ LOCAL_SHARED_LIBRARIES += libMpeg4SwEncoder LOCAL_SHARED_LIBRARIES += libqdMetaData LOCAL_SHARED_LIBRARIES += libnativewindow -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 @@ -1,6 +1,6 @@ #MSM_VIDC_TARGET_LIST := msmnile -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 @@ PRODUCT_PACKAGES += $(MM_CORE) 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 @@ -22,7 +22,7 @@ MM_VIDEO += libstagefrighthw PRODUCT_PACKAGES += $(MM_VIDEO) -ifeq ($(call is-board-platform-in-list, msmnile $(MSMSTEPPE)),true) +ifneq (,$(call is-board-platform-in-list2, msmnile $(MSMSTEPPE))) include hardware/qcom/sm8150/media/conf_files/$(TARGET_BOARD_PLATFORM)/$(TARGET_BOARD_PLATFORM).mk else ifeq ($(TARGET_BOARD_PLATFORM), sdmshrike) include hardware/qcom/media/conf_files/msmnile/msmnile.mk |