diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:30:47 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:30:47 +0000 |
| commit | b82ded93d4f517a77e618ab21bdfad9ee514b785 (patch) | |
| tree | 2eb13581610ca62002bc086502caafa8829b81dd | |
| parent | eeb28a0df3ee14192be0f0ba8bb00af49438b125 (diff) | |
| parent | 724a46603b82f0f68e2af8fd4cf34d2326f3749d (diff) | |
| download | libvpx-b82ded93d4f517a77e618ab21bdfad9ee514b785.tar.gz | |
Snap for 8358640 from 724a46603b82f0f68e2af8fd4cf34d2326f3749d to mainline-go-ipsec-release
Change-Id: I717c67a670ec3a5d2fc4845c5f12696fab7278e0
| -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, 24 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index e76d66da7..ecd4bb8ae 100644 --- a/Android.bp +++ b/Android.bp @@ -1191,6 +1191,10 @@ 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 3d6fb284a..1a3f7ddc9 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -96,6 +96,10 @@ cc_library { blocklist: "libvpx_blocklist.txt", }, min_sdk_version: "29", + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + ], } cc_fuzz { @@ -1,3 +1,6 @@ third_party { license_type: NOTICE + security { + tag: "NVD-CPE2.3:cpe:/a:webmproject:libvpx:-" + } } @@ -1,6 +1,5 @@ # 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 7318de2fc..87155fcb5 100644 --- a/libvpx/test/android/Android.mk +++ b/libvpx/test/android/Android.mk @@ -34,6 +34,9 @@ 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 @@ -48,6 +51,9 @@ 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 3b3dd1d39..23f935f2d 100644 --- a/libvpx/third_party/libwebm/Android.mk +++ b/libvpx/third_party/libwebm/Android.mk @@ -14,4 +14,7 @@ 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 f33f16e63..e6ebce0e7 100644 --- a/libwebm/Android.bp +++ b/libwebm/Android.bp @@ -20,6 +20,10 @@ cc_library_static { // cfi: true, }, min_sdk_version: "29", + apex_available: [ + "//apex_available:platform", + "com.android.media", + ], host_supported: true, target: { darwin: { |