Snap for 8426163 from ae3315be4a1907aa56366e42538f37256c7eaaa2 to mainline-tzdata2-release
Change-Id: I814c5a34b8cd2357a6124091828c1a4b4ac58843
diff --git a/Android.bp b/Android.bp
index 4045030..817ece6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,38 +13,6 @@
// limitations under the License.
//
-package {
- default_applicable_licenses: ["external_marisa-trie_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_marisa-trie_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-BSD-2-Clause",
- "SPDX-license-identifier-LGPL",
- "SPDX-license-identifier-LGPL-2.1+",
- ],
- license_text: [
- "COPYING.md",
- ],
-}
-
cc_library {
name: "marisa-trie",
sdk_version: "current",
diff --git a/METADATA b/METADATA
index 869970d..21a4d89 100644
--- a/METADATA
+++ b/METADATA
@@ -13,5 +13,5 @@
}
version: "v0.2.6"
last_upgrade_date { year: 2020 month: 7 day: 17 }
- license_type: RESTRICTED
+ license_type: NOTICE
}
diff --git a/include/marisa/scoped-array.h b/include/marisa/scoped-array.h
index 34cefa4..12b5b9e 100644
--- a/include/marisa/scoped-array.h
+++ b/include/marisa/scoped-array.h
@@ -16,7 +16,7 @@
}
void reset(T *array = NULL) {
- MARISA_DEBUG_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR);
+ MARISA_THROW_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR);
scoped_array(array).swap(*this);
}
diff --git a/include/marisa/scoped-ptr.h b/include/marisa/scoped-ptr.h
index abf48d8..63d7a3d 100644
--- a/include/marisa/scoped-ptr.h
+++ b/include/marisa/scoped-ptr.h
@@ -16,7 +16,7 @@
}
void reset(T *ptr = NULL) {
- MARISA_DEBUG_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR);
+ MARISA_THROW_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR);
scoped_ptr(ptr).swap(*this);
}