Snap for 8426163 from 264347ba9499b19a1bf991308c47ad5d8f5a547c to mainline-tzdata2-release
Change-Id: I2af4fea6e751c61e86baeb1ee0bc8480511cfa78
diff --git a/Android.bp b/Android.bp
index e5fcc18..aeb75d7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,44 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["external_owasp_sanitizer_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.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
- name: "external_owasp_sanitizer_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-CPL-1.0",
- "SPDX-license-identifier-MIT",
- ],
- license_text: [
- "COPYING",
- "NOTICE",
- ],
-}
-
java_library {
name: "owasp-html-sanitizer",
sdk_version: "19",
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 01c8338..0000000
--- a/METADATA
+++ /dev/null
@@ -1,6 +0,0 @@
-third_party {
- # would be NOTICE save for CPL 1.0 in:
- # lib/junit/cpl-v10.html
- # lib/junit/README.html
- license_type: RECIPROCAL
-}
