diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:51:09 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:51:09 +0000 |
commit | 4d62fa63952961ef94830f7c6a3726987f02ac8b (patch) | |
tree | f36e0f9da5855a1abb42f107a4e0733d79080e65 | |
parent | 9d5b24b15c7fedc7769c07cf42fa26e5bf6cbfc2 (diff) | |
parent | 54e0fac90467128ec18d06d8a3f994dc9dbbf7f8 (diff) | |
download | marisa-trie-4d62fa63952961ef94830f7c6a3726987f02ac8b.tar.gz |
Snap for 7478067 from 54e0fac90467128ec18d06d8a3f994dc9dbbf7f8 to mainline-cellbroadcast-releaseandroid-mainline-12.0.0_r86android-mainline-12.0.0_r71android-mainline-12.0.0_r7android-mainline-12.0.0_r60android-mainline-12.0.0_r43android-mainline-12.0.0_r24android-mainline-12.0.0_r116android-mainline-12.0.0_r101android12-mainline-cellbroadcast-release
Change-Id: I9e927ff3e744f80e395c36212b2ff220e95b9a94
-rw-r--r-- | Android.bp | 32 | ||||
-rw-r--r-- | METADATA | 2 | ||||
-rw-r--r-- | include/marisa/scoped-array.h | 2 | ||||
-rw-r--r-- | include/marisa/scoped-ptr.h | 2 |
4 files changed, 35 insertions, 3 deletions
@@ -13,6 +13,38 @@ // 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", @@ -13,5 +13,5 @@ third_party { } version: "v0.2.6" last_upgrade_date { year: 2020 month: 7 day: 17 } - license_type: NOTICE + license_type: RESTRICTED } diff --git a/include/marisa/scoped-array.h b/include/marisa/scoped-array.h index 12b5b9e..34cefa4 100644 --- a/include/marisa/scoped-array.h +++ b/include/marisa/scoped-array.h @@ -16,7 +16,7 @@ class scoped_array { } void reset(T *array = NULL) { - MARISA_THROW_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR); + MARISA_DEBUG_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 63d7a3d..abf48d8 100644 --- a/include/marisa/scoped-ptr.h +++ b/include/marisa/scoped-ptr.h @@ -16,7 +16,7 @@ class scoped_ptr { } void reset(T *ptr = NULL) { - MARISA_THROW_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR); + MARISA_DEBUG_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR); scoped_ptr(ptr).swap(*this); } |