Snap for 8426163 from 82589497aa60f574ef747e82935fd6f3cad8109a 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: Idceba13165f0b7e7e9ffe3024d726bb38eee9658

4 files changed, 3 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index 94a6488..b66d9d7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,21 +1,4 @@
 
-package {
-    default_applicable_licenses: ["external_dynamic_depth_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_dynamic_depth_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_defaults {
     name: "libdynamic_depth-defaults",
     cflags: [
@@ -55,6 +38,7 @@ cc_library_headers {
 cc_library {
     name: "libdynamic_depth",
     defaults: ["libdynamic_depth-defaults"],
+    vendor_available: false,
     header_libs: [
         "libdynamic_depth-public_headers",
         "libdynamic_depth-internal_headers",
@@ -70,6 +54,7 @@ cc_library {
 cc_library_static {
     name: "libdynamic_depth_ndk",
     defaults: ["libdynamic_depth-defaults"],
+    vendor_available: false,
     export_include_dirs: [
         "includes",
         "internal"
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..7a694c9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE
\ No newline at end of file
diff --git a/README.android b/README.android
index 2d08f65..248e7b6 100644
--- a/README.android
+++ b/README.android
@@ -8,4 +8,3 @@ Local patches
 - Android depth photo validation sequence "ValidateAndroidDynamicDepthBuffer()".
 - Add NDK library variant.
 - Check for depth map payload
-- Add missing <cassert> include to xmpmeta/xmp_parser.cc.
diff --git a/internal/xmpmeta/xmp_parser.cc b/internal/xmpmeta/xmp_parser.cc
index 6d08032..a0065fd 100644
--- a/internal/xmpmeta/xmp_parser.cc
+++ b/internal/xmpmeta/xmp_parser.cc
@@ -1,7 +1,6 @@
 #include "xmpmeta/xmp_parser.h"
 
 #include <algorithm>
-#include <cassert>
 #include <cstring>
 #include <sstream>
 #include <stack>