diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-06 03:08:02 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-06 03:08:02 +0000 |
commit | 329325365a31f52afccddab0520a6b33f89e70df (patch) | |
tree | 7850f168bffcaf3eec8c3e071459c0d1d86764c9 | |
parent | 650b4590e088f50504a960a74f21f3cd71fc0d10 (diff) | |
parent | 953ccf2641e9bebe5b94c43e6fe8f2166c2a009a (diff) | |
download | media-android13-gsi.tar.gz |
Snap for 7890423 from 953ccf2641e9bebe5b94c43e6fe8f2166c2a009a to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-14.0.0_r3android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I806bf2c6d6d9ae8b5ff0ba768bb356e287deff81
-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 |