diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-11-02 00:06:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 00:06:58 +0000 |
commit | 17a9af650faa589a2301b6fcdd6aa36c3b5d02c0 (patch) | |
tree | 8934b2a23f490de6f746c935d2aff1ee8f02f38b | |
parent | c2b52ca474f5871f9ebc2d2d685889d82e491ac0 (diff) | |
parent | 27510dde36a91c34f9d274fe96c4dfb788304426 (diff) | |
download | media-17a9af650faa589a2301b6fcdd6aa36c3b5d02c0.tar.gz |
Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2" am: 46138bfe3e am: 5c0efe0e17 am: 308bc9262a am: 27510dde36
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1871917
Change-Id: I4965974e7a066b1c8cb783acfb777d3f127e24f0
-rw-r--r-- | msm8996/mm-video-v4l2/vidc/vdec/Android.mk | 14 | ||||
-rw-r--r-- | msm8996/mm-video-v4l2/vidc/venc/Android.mk | 8 | ||||
-rw-r--r-- | msm8998/Android.mk | 4 | ||||
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/Android.mk | 10 | ||||
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/Android.mk | 16 |
5 files changed, 26 insertions, 26 deletions
diff --git a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk index 06477be..736e580 100644 --- a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk @@ -33,11 +33,11 @@ TARGETS_THAT_NEED_SW_HEVC := msm8974 msm8226 msm8916 TARGETS_THAT_SUPPORT_UBWC := msm8996 titanium TARGETS_THAT_NEED_SW_VDEC := msm8937 -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_HEVC_ADSP_HEAP)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_USE_HEVC_ADSP_HEAP))) libmm-vdec-def += -D_HEVC_USE_ADSP_HEAP_ endif -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 @@ -46,7 +46,7 @@ libmm-vdec-def += -DSMOOTH_STREAMING_DISABLED libmm-vdec-def += -DH264_PROFILE_LEVEL_CHECK endif -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_UBWC)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_UBWC))) libmm-vdec-def += -D_UBWC_ endif @@ -58,7 +58,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 $(CLEAR_VARS) # libOmxVdecHevc library is not built for OSS builds as QCPATH is null in OSS builds. ifneq "$(wildcard $(QCPATH) )" "" -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_HEVC_LIB)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_NEED_HEVC_LIB))) LOCAL_MODULE := libOmxVdecHevc LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD @@ -167,7 +167,7 @@ LOCAL_SRC_FILES += src/h264_utils.cpp LOCAL_SRC_FILES += src/ts_parser.cpp LOCAL_SRC_FILES += src/mp4_utils.cpp -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_HEVC)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_NEED_SW_HEVC))) LOCAL_SHARED_LIBRARIES += libHevcSwDecoder LOCAL_SRC_FILES += src/omx_vdec_hevc_swvdec.cpp else @@ -190,7 +190,7 @@ endif include $(CLEAR_VARS) ifneq "$(wildcard $(QCPATH) )" "" -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VDEC)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_NEED_SW_VDEC))) LOCAL_MODULE := libOmxSwVdec LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD diff --git a/msm8996/mm-video-v4l2/vidc/venc/Android.mk b/msm8996/mm-video-v4l2/vidc/venc/Android.mk index 351bcb2..9f75e22 100644 --- a/msm8996/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/venc/Android.mk @@ -41,7 +41,7 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm8996) libmm-venc-def += -D_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 @@ -49,7 +49,7 @@ ifeq ($(TARGET_USES_ION),true) libmm-venc-def += -DUSE_ION 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-venc-def += -DMASTER_SIDE_CP endif @@ -103,7 +103,7 @@ LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp include $(BUILD_SHARED_LIBRARY) -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_MPEG4)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_NEED_SW_VENC_MPEG4))) # --------------------------------------------------------------------------------- # Make the Shared library (libOmxSwVencMpeg4) # --------------------------------------------------------------------------------- @@ -135,7 +135,7 @@ LOCAL_SRC_FILES += src/omx_swvenc_mpeg4.cpp include $(BUILD_SHARED_LIBRARY) endif -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_HEVC)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_NEED_SW_VENC_HEVC))) # --------------------------------------------------------------------------------- # Make the Shared library (libOmxSwVenc) # --------------------------------------------------------------------------------- diff --git a/msm8998/Android.mk b/msm8998/Android.mk index 2e7f2c4..8960a39 100644 --- a/msm8998/Android.mk +++ b/msm8998/Android.mk @@ -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)/mm-core/Android.mk include $(QCOM_MEDIA_ROOT)/libstagefrighthw/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)/mm-video-v4l2/Android.mk ifeq ($(BOARD_USES_ADRENO), true) diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk index b876ad2..5bd1f67 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk @@ -31,11 +31,11 @@ TARGETS_THAT_HAVE_VENUS_HEVC := apq8084 msm8994 msm8996 TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8953 msm8998 sdm660 TARGETS_THAT_NEED_SW_VDEC := msm8937 msm8909 -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_HEVC_ADSP_HEAP)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_USE_HEVC_ADSP_HEAP))) libmm-vdec-def += -D_HEVC_USE_ADSP_HEAP_ endif -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 @@ -44,7 +44,7 @@ libmm-vdec-def += -DSMOOTH_STREAMING_DISABLED libmm-vdec-def += -DH264_PROFILE_LEVEL_CHECK endif -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_UBWC)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_UBWC))) libmm-vdec-def += -D_UBWC_ endif @@ -56,7 +56,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 @@ -149,7 +149,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) ifneq "$(wildcard $(QCPATH) )" "" -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VDEC)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_NEED_SW_VDEC))) LOCAL_MODULE := libOmxSwVdec LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD diff --git a/msm8998/mm-video-v4l2/vidc/venc/Android.mk b/msm8998/mm-video-v4l2/vidc/venc/Android.mk index 197c976..0155281 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk @@ -41,19 +41,19 @@ libmm-venc-def += -DMAX_RES_1080P_EBI endif endif -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_UBWC)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_UBWC))) libmm-venc-def += -D_UBWC_ endif -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_NV21)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_USE_NV21))) libmm-venc-def += -D_NV21_ endif -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_SUPPORT_PQ)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_PQ))) ifneq ($(wildcard vendor/qcom/$(TARGET_BOARD_PLATFORM)/prebuilts/grease/),) libmm-venc-def += -D_PQ_ else @@ -61,7 +61,7 @@ $(warning "venc: PQ compiled out") endif 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 @@ -71,7 +71,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 @@ -94,7 +94,7 @@ libmm-venc-inc += frameworks/native/libs/arect/include libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_PQ)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_PQ))) libmm-venc-inc += $(TARGET_OUT_HEADERS)/libgpustats endif @@ -140,7 +140,7 @@ LOCAL_CFLAGS += -Wno-implicit-fallthrough include $(BUILD_SHARED_LIBRARY) -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_MPEG4)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_NEED_SW_VENC_MPEG4))) # --------------------------------------------------------------------------------- # Make the Shared library (libOmxSwVencMpeg4) # --------------------------------------------------------------------------------- |