Snap for 8426163 from cc50918f07cd929227e0e93c85b897c84aa499c8 to mainline-tzdata2-release
Change-Id: Iebf3ed9c635c25e9c95cecd7c6a7ce4dcaa5397a
diff --git a/Android.bp b/Android.bp
index f8721c2..9304340 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,34 +1,3 @@
-package {
- default_applicable_licenses: ["prebuilts_maven_repo_bumptech_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: "prebuilts_maven_repo_bumptech_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-MIT",
- ],
- license_text: [
- "LICENSE",
- ],
-}
-
java_import {
name: "glide-prebuilt",
jars: [
@@ -37,11 +6,5 @@
"com/github/bumptech/glide/gifdecoder/4.8.0/gifdecoder-4.8.0.jar",
],
jetifier: true,
- apex_available: [
- "com.android.mediaprovider",
- "//apex_available:platform",
- ],
- sdk_version: "current",
- min_sdk_version: "14",
notice: "LICENSE",
}
