Snap for 8426163 from bc5b71ea687cbe1a5675215e617d1f4b310cc4e5 to mainline-tzdata2-release
Change-Id: Ic187da60d3acc83779796a856f3b6b2ad2ea0b20
diff --git a/Android.bp b/Android.bp
index 1b291b2..45beb08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,23 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["external_python_six_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
- name: "external_python_six_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-MIT",
- ],
- license_text: [
- "LICENSE",
- ],
-}
-
python_library {
name: "py-six",
host_supported: true,
diff --git a/METADATA b/METADATA
index 2b372ac..966ee5c 100644
--- a/METADATA
+++ b/METADATA
@@ -12,6 +12,5 @@
value: "https://github.com/benjaminp/six"
}
version: "1.11.0"
- license_type: NOTICE
last_upgrade_date { year: 2018 month: 1 day: 4 }
}
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..f3068bf
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,18 @@
+Copyright (c) 2010-2017 Benjamin Peterson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..61a80b2
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "presubmit" : [
+ {
+ "name" : "acloud_test",
+ "host" : true
+ }
+ ]
+}
