diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:41:04 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:41:04 +0000 |
| commit | 95a0036247245c7c14572ff246b42f0a7cfc77f3 (patch) | |
| tree | 6016ecfda054e98bc7b4693eeb3d59241f8079e7 | |
| parent | 3b1910c3f84cef67ca54c5d7eb79ad6192b396b4 (diff) | |
| parent | 363cb20eb90577f994f409fa8577967e24d21d5c (diff) | |
| download | libvpx-95a0036247245c7c14572ff246b42f0a7cfc77f3.tar.gz | |
Snap for 8730993 from 363cb20eb90577f994f409fa8577967e24d21d5c to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010
Change-Id: I6133611119e1fc89315733b31a01201d7574ac55
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | Android.bp.in | 4 | ||||
| -rw-r--r-- | METADATA | 3 | ||||
| -rw-r--r-- | OWNERS | 1 | ||||
| -rw-r--r-- | libvpx/test/android/Android.mk | 6 | ||||
| -rw-r--r-- | libvpx/third_party/libwebm/Android.mk | 3 | ||||
| -rw-r--r-- | libwebm/Android.bp | 4 |
7 files changed, 1 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp index ecd4bb8ae..e76d66da7 100644 --- a/Android.bp +++ b/Android.bp @@ -1191,10 +1191,6 @@ cc_library { blocklist: "libvpx_blocklist.txt", }, min_sdk_version: "29", - apex_available: [ - "//apex_available:platform", - "com.android.media.swcodec", - ], } cc_fuzz { diff --git a/Android.bp.in b/Android.bp.in index 1a3f7ddc9..3d6fb284a 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -96,10 +96,6 @@ cc_library { blocklist: "libvpx_blocklist.txt", }, min_sdk_version: "29", - apex_available: [ - "//apex_available:platform", - "com.android.media.swcodec", - ], } cc_fuzz { @@ -1,6 +1,3 @@ third_party { license_type: NOTICE - security { - tag: "NVD-CPE2.3:cpe:/a:webmproject:libvpx:-" - } } @@ -1,5 +1,6 @@ # owners for external/libvpx include platform/frameworks/av:/media/janitors/codec_OWNERS jianj@google.com +marcone@google.com jzern@google.com vigneshv@google.com diff --git a/libvpx/test/android/Android.mk b/libvpx/test/android/Android.mk index 87155fcb5..7318de2fc 100644 --- a/libvpx/test/android/Android.mk +++ b/libvpx/test/android/Android.mk @@ -34,9 +34,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include/ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/include/ LOCAL_SRC_FILES := ./third_party/googletest/src/src/gtest-all.cc -LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS include $(BUILD_STATIC_LIBRARY) #libvpx_test @@ -51,9 +48,6 @@ else LOCAL_STATIC_LIBRARIES += vpx endif -LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS include $(LOCAL_PATH)/test/test.mk LOCAL_C_INCLUDES := $(BINDINGS_DIR) FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes))) diff --git a/libvpx/third_party/libwebm/Android.mk b/libvpx/third_party/libwebm/Android.mk index 23f935f2d..3b3dd1d39 100644 --- a/libvpx/third_party/libwebm/Android.mk +++ b/libvpx/third_party/libwebm/Android.mk @@ -14,7 +14,4 @@ LOCAL_SRC_FILES:= common/file_util.cc \ mkvmuxer/mkvmuxer.cc \ mkvmuxer/mkvmuxerutil.cc \ mkvmuxer/mkvwriter.cc -LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE.TXT $(LOCAL_PATH)/PATENTS.TXT include $(BUILD_STATIC_LIBRARY) diff --git a/libwebm/Android.bp b/libwebm/Android.bp index e6ebce0e7..f33f16e63 100644 --- a/libwebm/Android.bp +++ b/libwebm/Android.bp @@ -20,10 +20,6 @@ cc_library_static { // cfi: true, }, min_sdk_version: "29", - apex_available: [ - "//apex_available:platform", - "com.android.media", - ], host_supported: true, target: { darwin: { |