diff options
author | Sasha Smundak <asmundak@google.com> | 2021-11-05 03:19:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-05 03:19:43 +0000 |
commit | 953ccf2641e9bebe5b94c43e6fe8f2166c2a009a (patch) | |
tree | 7850f168bffcaf3eec8c3e071459c0d1d86764c9 | |
parent | 801ff566b2daead93eabd8f8271dc6f5ab90838b (diff) | |
parent | b95df1b813959a74447e60a43c5cd12626f762d6 (diff) | |
download | media-953ccf2641e9bebe5b94c43e6fe8f2166c2a009a.tar.gz |
Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: 9e36b43573 am: df6d1d9312 am: 72225af0be am: 507c5fb10e am: b95df1b813HEADt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-u-beta-1-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1871696
Change-Id: I0a4540b54b5b6715eb4c87b340e6d52786d4f546
-rw-r--r-- | Android.mk | 4 | ||||
-rwxr-xr-x | mm-core/Android.mk | 4 | ||||
-rwxr-xr-x | mm-video-v4l2/vidc/vdec/Android.mk | 8 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 14 |
4 files changed, 15 insertions, 15 deletions
@@ -1,14 +1,14 @@ 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))) ifneq ($(BUILD_WITHOUT_VENDOR),true) include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk endif endif -ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true) +ifneq (,$(call is-board-platform-in-list2, $(MSM_VIDC_TARGET_LIST))) ifneq ($(BUILD_WITHOUT_VENDOR),true) 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 f43507b4..c58f0257 100755 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -76,7 +76,7 @@ LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE 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) @@ -111,7 +111,7 @@ LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE 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 6ba3579e..de00a439 100755 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -27,7 +27,7 @@ TARGETS_THAT_HAVE_VENUS_HEVC := apq8084 msm8994 msm8996 TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8953 msm8998 sdm660 sdm845 msmpeafowl sdm710 qcs605 TARGETS_THAT_NEED_SW_VDEC := msm8937 sdm845 msmpeafowl sdm710 qcs605 -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 @@ -35,7 +35,7 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm8610) libmm-vdec-def += -DSMOOTH_STREAMING_DISABLED 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 @@ -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 @@ -134,7 +134,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/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index b2b305af..f9d0173c 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -31,15 +31,15 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm8610) libmm-venc-def += -D_MSM8610_ 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_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 @@ -49,7 +49,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 @@ -67,7 +67,7 @@ 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_SW_VENC_ROTATION)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_SW_VENC_ROTATION))) libmm-venc-inc += hardware/libhardware/include/hardware endif @@ -119,7 +119,7 @@ LOCAL_CFLAGS += -Wno-error=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) # --------------------------------------------------------------------------------- @@ -151,7 +151,7 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libplatformconfig libMpeg4Sw LOCAL_SHARED_LIBRARIES += libnativewindow LOCAL_SHARED_LIBRARIES += libqdMetaData -ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_SW_VENC_ROTATION)),true) +ifneq (,$(call is-board-platform-in-list2, $(TARGETS_THAT_SUPPORT_SW_VENC_ROTATION))) LOCAL_SHARED_LIBRARIES += libui LOCAL_SHARED_LIBRARIES += libutils endif |