Merge "cherry-pick vp8 integer overflow fixes" am: 286fa7c031 am: 363cb20eb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libvpx/+/16267294
Change-Id: I73ba4ab878c020b718613454ea93d03a55724ee5
diff --git a/METADATA b/METADATA
index d97975c..4859849 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,6 @@
third_party {
license_type: NOTICE
+ security {
+ tag: "NVD-CPE2.3:cpe:/a:webmproject:libvpx:-"
+ }
}
diff --git a/OWNERS b/OWNERS
index dbf2c0e..acbe806 100644
--- a/OWNERS
+++ b/OWNERS
@@ -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 7318de2..87155fc 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/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 @@
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 3b3dd1d..23f935f 100644
--- a/libvpx/third_party/libwebm/Android.mk
+++ b/libvpx/third_party/libwebm/Android.mk
@@ -14,4 +14,7 @@
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)