Snap for 7550844 from b4bd25d00d5a1762a6dd1ddd187fb98a9efa9919 to mainline-tethering-releaseandroid-mainline-12.0.0_r95android-mainline-12.0.0_r82android-mainline-12.0.0_r66android-mainline-12.0.0_r53android-mainline-12.0.0_r38android-mainline-12.0.0_r18android-mainline-12.0.0_r125android-mainline-12.0.0_r110aml_tet_311811050android12-mainline-tethering-release

Change-Id: I93d4e2f54717c7fb8c2dcbb7748dcb016a6b6349

4 files changed, 19 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index b66d9d7..94a6488 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,21 @@
 
+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: [
@@ -38,7 +55,6 @@ 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",
@@ -54,7 +70,6 @@ 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
deleted file mode 120000
index 7a694c9..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file
diff --git a/README.android b/README.android
index 248e7b6..2d08f65 100644
--- a/README.android
+++ b/README.android
@@ -8,3 +8,4 @@ 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 a0065fd..6d08032 100644
--- a/internal/xmpmeta/xmp_parser.cc
+++ b/internal/xmpmeta/xmp_parser.cc
@@ -1,6 +1,7 @@
 #include "xmpmeta/xmp_parser.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstring>
 #include <sstream>
 #include <stack>