Snap for 8426163 from 2f79a0fdace446afd17a6b539b391be92214fd47 to mainline-tzdata2-release
Change-Id: Id4ad4eb019c1281453b031092bcd3fe409a5a8ee
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 6b1501f..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (C) 2021 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
- default_applicable_licenses: ["external_oauth_license"],
-}
-
-// Added automatically by a large-scale-change
-//
-// 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_oauth_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- ],
- license_text: [
- "LICENSE.txt",
- "NOTICE",
- ],
-}
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: NOTICE
-}
diff --git a/core/src/main/java/Android.bp b/core/src/main/java/Android.bp
index 6c9b39a..412ca6e 100644
--- a/core/src/main/java/Android.bp
+++ b/core/src/main/java/Android.bp
@@ -1,13 +1,4 @@
// Build the client static library for the Google Services Framework
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "external_oauth_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["external_oauth_license"],
-}
-
java_library {
name: "oauth",
srcs: ["net/**/*.java"],
