Snap for 8426163 from 7196a556b5a73284d5fe5f7fed141147c2c41816 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I13af906c1b54449f3ee58db2e671bc51a5d6eb42

13 files changed, 14 insertions, 88 deletions

diff --git a/Android.bp b/Android.bp
index 216ef220c..448ebb62a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,37 +1,6 @@
 // THIS FILE IS AUTOGENERATED, DO NOT EDIT
 // Generated from Android.bp.in, run ./generate_config.sh to regenerate
 
-package {
-    default_applicable_licenses: ["external_libvpx_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "external_libvpx_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-ISC",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 libvpx_arm_neon_c_srcs = [
     "libvpx/vp8/common/alloccommon.c",
     "libvpx/vp8/common/arm/loopfilter_arm.c",
@@ -1129,14 +1098,6 @@ cc_library {
         darwin: {
             enabled: false,
         },
-        android: {
-            sanitize: {
-                cfi: true,
-                config: {
-                    cfi_assembly_support: true,
-                },
-            },
-        },
     },
 
     arch: {
@@ -1183,7 +1144,9 @@ cc_library {
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],
-        blocklist: "libvpx_blocklist.txt",
+        // Enable CFI if this becomes a shared library.
+        // cfi: true,
+        blacklist: "libvpx_blacklist.txt",
     },
     min_sdk_version: "29",
 }
diff --git a/Android.bp.in b/Android.bp.in
index 8ed278fdb..612551c88 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -56,7 +56,7 @@ cc_library {
         misc_undefined: ["bounds"],
         // Enable CFI if this becomes a shared library.
         // cfi: true,
-        blocklist: "libvpx_blocklist.txt",
+        blacklist: "libvpx_blacklist.txt",
     },
 }
 
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975ca3..000000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/OWNERS b/OWNERS
index dbf2c0e2e..92de0d772 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,5 @@
-# owners for external/libvpx
-include platform/frameworks/av:/media/janitors/codec_OWNERS
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
 jianj@google.com
 marcone@google.com
 jzern@google.com
diff --git a/README.version b/README.version
index f555bcc48..7e8c25da3 100644
--- a/README.version
+++ b/README.version
@@ -11,4 +11,3 @@ Local Modifications:
   5e065cf9d vp8/{ratectrl,onyx_if}: fix some signed integer overflows
   5eab093a7 vp9_ratectrl: fix some signed integer overflows
   baefbe85d Cap target bitrate to raw rate internally
-  5f345a924 Avoid overflow in calc_iframe_target_size
diff --git a/libvpx/build/make/Android.mk b/libvpx/build/make/Android.mk
index b8032e67a..6cb3af027 100644
--- a/libvpx/build/make/Android.mk
+++ b/libvpx/build/make/Android.mk
@@ -166,9 +166,6 @@ LOCAL_CFLAGS += \
     -I$(ASM_CNV_PATH)/libvpx
 
 LOCAL_MODULE := libvpx
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS
 
 ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes)
   LOCAL_STATIC_LIBRARIES := cpufeatures
diff --git a/libvpx/test/android/Android.mk b/libvpx/test/android/Android.mk
index 9c61ec534..7318de2fc 100644
--- a/libvpx/test/android/Android.mk
+++ b/libvpx/test/android/Android.mk
@@ -30,9 +30,6 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_MODULE := gtest
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS
 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/
@@ -43,9 +40,6 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libvpx_test
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS
 LOCAL_STATIC_LIBRARIES := gtest libwebm
 
 ifeq ($(ENABLE_SHARED),1)
diff --git a/libvpx/third_party/libwebm/Android.mk b/libvpx/third_party/libwebm/Android.mk
index 72e5583c1..b46ba101d 100644
--- a/libvpx/third_party/libwebm/Android.mk
+++ b/libvpx/third_party/libwebm/Android.mk
@@ -2,9 +2,6 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libwebm
-LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS:= notice
-LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/LICENSE.TXT $(LOCAL_PATH)/PATENTS.TXT
 LOCAL_CPPFLAGS:=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
 LOCAL_CPPFLAGS+=-D__STDC_LIMIT_MACROS -std=c++11
 LOCAL_C_INCLUDES:= $(LOCAL_PATH)
diff --git a/libvpx/vp8/encoder/ratectrl.c b/libvpx/vp8/encoder/ratectrl.c
index d93fb59a4..d8d55fce2 100644
--- a/libvpx/vp8/encoder/ratectrl.c
+++ b/libvpx/vp8/encoder/ratectrl.c
@@ -349,12 +349,8 @@ static void calc_iframe_target_size(VP8_COMP *cpi) {
   }
 
   if (cpi->oxcf.rc_max_intra_bitrate_pct) {
-    unsigned int max_rate;
-    // This product may overflow unsigned int
-    uint64_t product = cpi->per_frame_bandwidth;
-    product *= cpi->oxcf.rc_max_intra_bitrate_pct;
-    product /= 100;
-    max_rate = (unsigned int)VPXMIN(INT_MAX, product);
+    unsigned int max_rate =
+        cpi->per_frame_bandwidth * cpi->oxcf.rc_max_intra_bitrate_pct / 100;
 
     if (target > max_rate) target = max_rate;
   }
diff --git a/libvpx_blocklist.txt b/libvpx_blacklist.txt
index c9ea142e3..df3e36c1d 100644
--- a/libvpx_blocklist.txt
+++ b/libvpx_blacklist.txt
@@ -1,3 +1,6 @@
+[cfi]
+src:*external/libvpx/*
+
 [integer]
 # Performance related
 fun:read_bool
diff --git a/libwebm/Android.bp b/libwebm/Android.bp
index f33f16e63..6141b100f 100644
--- a/libwebm/Android.bp
+++ b/libwebm/Android.bp
@@ -1,12 +1,3 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libvpx_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_libvpx_license"],
-}
-
 cc_library_static {
     name: "libwebm",
     srcs: ["mkvparser/mkvparser.cc"],
@@ -20,10 +11,4 @@ cc_library_static {
         // cfi: true,
     },
     min_sdk_version: "29",
-    host_supported: true,
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
 }
diff --git a/libwebm/README.android b/libwebm/README.android
index e89a0ffc2..c55bd748f 100644
--- a/libwebm/README.android
+++ b/libwebm/README.android
@@ -1,7 +1,7 @@
 Name: libwebm
 URL: http://www.webmproject.org
 
-Commit: 11cae244cc06c1295bffa9861c610dcde3b9da18
+Commit: 81de00c43ea3c087b48a8c20337db7531b9f7612
 
 Description:
 Contains the sources used to compile libwebm's matroska parser.
diff --git a/libwebm/mkvparser/mkvparser.cc b/libwebm/mkvparser/mkvparser.cc
index 412e6a52c..ace65bd59 100644
--- a/libwebm/mkvparser/mkvparser.cc
+++ b/libwebm/mkvparser/mkvparser.cc
@@ -5229,8 +5229,6 @@ bool Projection::Parse(IMkvReader* reader, long long start, long long size,
 
       projection_ptr->type = static_cast<ProjectionType>(projection_type);
     } else if (child_id == libwebm::kMkvProjectionPrivate) {
-      if (projection_ptr->private_data != NULL)
-        return false;
       unsigned char* data = SafeArrayAlloc<unsigned char>(1, child_size);
 
       if (data == NULL)
@@ -5288,7 +5286,6 @@ VideoTrack::VideoTrack(Segment* pSegment, long long element_start,
       m_projection(NULL) {}
 
 VideoTrack::~VideoTrack() {
-  delete[] m_colour_space;
   delete m_colour;
   delete m_projection;
 }
@@ -5310,7 +5307,7 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
   long long stereo_mode = 0;
 
   double rate = 0.0;
-  std::unique_ptr<char[]> colour_space_ptr;
+  char* colour_space = NULL;
 
   IMkvReader* const pReader = pSegment->m_pReader;
 
@@ -5387,11 +5384,9 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
         projection_ptr.reset(projection);
       }
     } else if (id == libwebm::kMkvColourSpace) {
-      char* colour_space = NULL;
       const long status = UnserializeString(pReader, pos, size, colour_space);
       if (status < 0)
         return status;
-      colour_space_ptr.reset(colour_space);
     }
 
     pos += size;  // consume payload
@@ -5423,7 +5418,7 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
   pTrack->m_stereo_mode = stereo_mode;
   pTrack->m_rate = rate;
   pTrack->m_colour = colour_ptr.release();
-  pTrack->m_colour_space = colour_space_ptr.release();
+  pTrack->m_colour_space = colour_space;
   pTrack->m_projection = projection_ptr.release();
 
   pResult = pTrack;