Cleanup licensing metadata.

Bug: 191699332
Test: ./update-tzdata.py
Change-Id: I64a8070615a9baa61d4720c1c123ef66014d189e
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index e716011..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,46 +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: ["system_timezone_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.
-// http://go/android-license-faq
-license {
-    name: "system_timezone_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-Unicode-DFS",
-        "legacy_notice",
-        "legacy_unencumbered",
-    ],
-    // large-scale-change unable to identify any license_text files
-}
diff --git a/apex/Android.bp b/apex/Android.bp
index 9521f55..b12a726 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Defaults shared between real and test versions of the APEX.
diff --git a/apex/tests/Android.bp b/apex/tests/Android.bp
index 7677653..24692c1 100644
--- a/apex/tests/Android.bp
+++ b/apex/tests/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 android_test {
diff --git a/debug_tools/host/Android.bp b/debug_tools/host/Android.bp
index bcad93d..20ca56d 100644
--- a/debug_tools/host/Android.bp
+++ b/debug_tools/host/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 java_library_host {
diff --git a/distro/core/Android.bp b/distro/core/Android.bp
index 6bb2279..49f24f9 100644
--- a/distro/core/Android.bp
+++ b/distro/core/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Library of classes for handling time zone distros. Used on-device for
diff --git a/distro/installer/Android.bp b/distro/installer/Android.bp
index 59a48ce..de80a88 100644
--- a/distro/installer/Android.bp
+++ b/distro/installer/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // The classes needed to handle installation of time zone distros.
diff --git a/distro/tools/Android.bp b/distro/tools/Android.bp
index 02c195c..3f7e6a1 100644
--- a/distro/tools/Android.bp
+++ b/distro/tools/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // The tool used to create time zone distro.zip files.
diff --git a/input_tools/android/common/Android.bp b/input_tools/android/common/Android.bp
index da061ed..e5cb2ac 100644
--- a/input_tools/android/common/Android.bp
+++ b/input_tools/android/common/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Code common to various time zone host tools.
diff --git a/input_tools/android/telephonylookup_generator/Android.bp b/input_tools/android/telephonylookup_generator/Android.bp
index e2b24d4..30d9fe4 100644
--- a/input_tools/android/telephonylookup_generator/Android.bp
+++ b/input_tools/android/telephonylookup_generator/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Proto library
diff --git a/input_tools/android/tzids/Android.bp b/input_tools/android/tzids/Android.bp
index 676fdb1..869ab71 100644
--- a/input_tools/android/tzids/Android.bp
+++ b/input_tools/android/tzids/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Proto library
diff --git a/input_tools/android/tzlookup_generator/Android.bp b/input_tools/android/tzlookup_generator/Android.bp
index c8140a2..8418800 100644
--- a/input_tools/android/tzlookup_generator/Android.bp
+++ b/input_tools/android/tzlookup_generator/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Proto library
diff --git a/input_tools/android/zone_compactor/Android.bp b/input_tools/android/zone_compactor/Android.bp
index e4d37d0..b116ca2 100644
--- a/input_tools/android/zone_compactor/Android.bp
+++ b/input_tools/android/zone_compactor/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // A static library for the zone_compactor host tool.
diff --git a/output_data/Android.bp b/output_data/Android.bp
index 9b28c6a..fb37e06 100644
--- a/output_data/Android.bp
+++ b/output_data/Android.bp
@@ -14,12 +14,32 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-MIT
-    //   SPDX-license-identifier-Unicode-DFS
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+license {
+    name: "system_timezone_output_data_iana_licence",
+    visibility: ["//visibility:private"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "iana/NOTICE",
+    ],
+}
+
+license {
+    name: "system_timezone_output_data_icu_licence",
+    visibility: ["//visibility:private"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Unicode-DFS",
+    ],
+    license_text: [
+        "icu_overlay/LICENSE",
+    ],
 }
 
 prebuilt_etc {
@@ -49,6 +69,7 @@
 prebuilt_etc {
     name: "apex_tzdata",
     src: "iana/tzdata",
+    licenses: ["system_timezone_output_data_iana_licence"],
     notice: "iana/NOTICE",
     filename: "tzdata",
     sub_dir: "tz",
@@ -58,6 +79,7 @@
 prebuilt_etc {
     name: "apex_icu_tzdata.dat",
     src: "icu_overlay/icu_tzdata.dat",
+    licenses: ["system_timezone_output_data_icu_licence"],
     notice: "icu_overlay/LICENSE",
     filename: "icu_tzdata.dat",
     sub_dir: "icu",
diff --git a/output_data/android/Android.bp b/output_data/android/Android.bp
index c3c5677..1ea41e6 100644
--- a/output_data/android/Android.bp
+++ b/output_data/android/Android.bp
@@ -13,11 +13,7 @@
 // limitations under the License.
 
 package {
-    // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   legacy_notice
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Module definition producing a tzlookup.xml prebuilt file in
diff --git a/output_data/distro/LICENSE b/output_data/distro/LICENSE
new file mode 100644
index 0000000..5d664a0
--- /dev/null
+++ b/output_data/distro/LICENSE
@@ -0,0 +1,414 @@
+COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
+
+Copyright © 1991-2020 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+
+---------------------
+
+Third-Party Software Licenses
+
+This section contains third-party software notices and/or additional
+terms for licensed third-party software components included within ICU
+libraries.
+
+1. ICU License - ICU 1.8.1 to ICU 57.1
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2016 International Business Machines Corporation and others
+All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the
+property of their respective owners.
+
+2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+
+ #     The Google Chrome software developed by Google is licensed under
+ # the BSD license. Other software included in this distribution is
+ # provided under other licenses, as set forth below.
+ #
+ #  The BSD License
+ #  http://opensource.org/licenses/bsd-license.php
+ #  Copyright (C) 2006-2008, Google Inc.
+ #
+ #  All rights reserved.
+ #
+ #  Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are met:
+ #
+ #  Redistributions of source code must retain the above copyright notice,
+ # this list of conditions and the following disclaimer.
+ #  Redistributions in binary form must reproduce the above
+ # copyright notice, this list of conditions and the following
+ # disclaimer in the documentation and/or other materials provided with
+ # the distribution.
+ #  Neither the name of  Google Inc. nor the names of its
+ # contributors may be used to endorse or promote products derived from
+ # this software without specific prior written permission.
+ #
+ #
+ #  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #
+ #
+ #  The word list in cjdict.txt are generated by combining three word lists
+ # listed below with further processing for compound word breaking. The
+ # frequency is generated with an iterative training against Google web
+ # corpora.
+ #
+ #  * Libtabe (Chinese)
+ #    - https://sourceforge.net/project/?group_id=1519
+ #    - Its license terms and conditions are shown below.
+ #
+ #  * IPADIC (Japanese)
+ #    - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+ #    - Its license terms and conditions are shown below.
+ #
+ #  ---------COPYING.libtabe ---- BEGIN--------------------
+ #
+ #  /*
+ #   * Copyright (c) 1999 TaBE Project.
+ #   * Copyright (c) 1999 Pai-Hsiang Hsiao.
+ #   * All rights reserved.
+ #   *
+ #   * Redistribution and use in source and binary forms, with or without
+ #   * modification, are permitted provided that the following conditions
+ #   * are met:
+ #   *
+ #   * . Redistributions of source code must retain the above copyright
+ #   *   notice, this list of conditions and the following disclaimer.
+ #   * . Redistributions in binary form must reproduce the above copyright
+ #   *   notice, this list of conditions and the following disclaimer in
+ #   *   the documentation and/or other materials provided with the
+ #   *   distribution.
+ #   * . Neither the name of the TaBE Project nor the names of its
+ #   *   contributors may be used to endorse or promote products derived
+ #   *   from this software without specific prior written permission.
+ #   *
+ #   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ #   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ #   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ #   * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ #   * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ #   * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ #   * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ #   * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ #   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ #   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ #   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ #   * OF THE POSSIBILITY OF SUCH DAMAGE.
+ #   */
+ #
+ #  /*
+ #   * Copyright (c) 1999 Computer Systems and Communication Lab,
+ #   *                    Institute of Information Science, Academia
+ #       *                    Sinica. All rights reserved.
+ #   *
+ #   * Redistribution and use in source and binary forms, with or without
+ #   * modification, are permitted provided that the following conditions
+ #   * are met:
+ #   *
+ #   * . Redistributions of source code must retain the above copyright
+ #   *   notice, this list of conditions and the following disclaimer.
+ #   * . Redistributions in binary form must reproduce the above copyright
+ #   *   notice, this list of conditions and the following disclaimer in
+ #   *   the documentation and/or other materials provided with the
+ #   *   distribution.
+ #   * . Neither the name of the Computer Systems and Communication Lab
+ #   *   nor the names of its contributors may be used to endorse or
+ #   *   promote products derived from this software without specific
+ #   *   prior written permission.
+ #   *
+ #   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ #   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ #   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ #   * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ #   * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ #   * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ #   * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ #   * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ #   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ #   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ #   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ #   * OF THE POSSIBILITY OF SUCH DAMAGE.
+ #   */
+ #
+ #  Copyright 1996 Chih-Hao Tsai @ Beckman Institute,
+ #      University of Illinois
+ #  c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
+ #
+ #  ---------------COPYING.libtabe-----END--------------------------------
+ #
+ #
+ #  ---------------COPYING.ipadic-----BEGIN-------------------------------
+ #
+ #  Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+ #  and Technology.  All Rights Reserved.
+ #
+ #  Use, reproduction, and distribution of this software is permitted.
+ #  Any copy of this software, whether in its original form or modified,
+ #  must include both the above copyright notice and the following
+ #  paragraphs.
+ #
+ #  Nara Institute of Science and Technology (NAIST),
+ #  the copyright holders, disclaims all warranties with regard to this
+ #  software, including all implied warranties of merchantability and
+ #  fitness, in no event shall NAIST be liable for
+ #  any special, indirect or consequential damages or any damages
+ #  whatsoever resulting from loss of use, data or profits, whether in an
+ #  action of contract, negligence or other tortuous action, arising out
+ #  of or in connection with the use or performance of this software.
+ #
+ #  A large portion of the dictionary entries
+ #  originate from ICOT Free Software.  The following conditions for ICOT
+ #  Free Software applies to the current dictionary as well.
+ #
+ #  Each User may also freely distribute the Program, whether in its
+ #  original form or modified, to any third party or parties, PROVIDED
+ #  that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+ #  on, or be attached to, the Program, which is distributed substantially
+ #  in the same form as set out herein and that such intended
+ #  distribution, if actually made, will neither violate or otherwise
+ #  contravene any of the laws and regulations of the countries having
+ #  jurisdiction over the User or the intended distribution itself.
+ #
+ #  NO WARRANTY
+ #
+ #  The program was produced on an experimental basis in the course of the
+ #  research and development conducted during the project and is provided
+ #  to users as so produced on an experimental basis.  Accordingly, the
+ #  program is provided without any warranty whatsoever, whether express,
+ #  implied, statutory or otherwise.  The term "warranty" used herein
+ #  includes, but is not limited to, any warranty of the quality,
+ #  performance, merchantability and fitness for a particular purpose of
+ #  the program and the nonexistence of any infringement or violation of
+ #  any right of any third party.
+ #
+ #  Each user of the program will agree and understand, and be deemed to
+ #  have agreed and understood, that there is no warranty whatsoever for
+ #  the program and, accordingly, the entire risk arising from or
+ #  otherwise connected with the program is assumed by the user.
+ #
+ #  Therefore, neither ICOT, the copyright holder, or any other
+ #  organization that participated in or was otherwise related to the
+ #  development of the program and their respective officials, directors,
+ #  officers and other employees shall be held liable for any and all
+ #  damages, including, without limitation, general, special, incidental
+ #  and consequential damages, arising out of or otherwise in connection
+ #  with the use or inability to use the program or any product, material
+ #  or result produced or otherwise obtained by using the program,
+ #  regardless of whether they have been advised of, or otherwise had
+ #  knowledge of, the possibility of such damages at any time during the
+ #  project or thereafter.  Each user will be deemed to have agreed to the
+ #  foregoing by his or her commencement of use of the program.  The term
+ #  "use" as used herein includes, but is not limited to, the use,
+ #  modification, copying and distribution of the program and the
+ #  production of secondary products from the program.
+ #
+ #  In the case where the program, whether in its original form or
+ #  modified, was distributed or delivered to or received by a user from
+ #  any person, organization or entity other than ICOT, unless it makes or
+ #  grants independently of ICOT any specific warranty to the user in
+ #  writing, such person, organization or entity, will also be exempted
+ #  from and not be held liable to the user for any such damages as noted
+ #  above as far as the program is concerned.
+ #
+ #  ---------------COPYING.ipadic-----END----------------------------------
+
+3. Lao Word Break Dictionary Data (laodict.txt)
+
+ #  Copyright (c) 2013 International Business Machines Corporation
+ #  and others. All Rights Reserved.
+ #
+ # Project: https://github.com/veer66/lao-dictionary
+ # Dictionary: https://github.com/veer66/lao-dictionary/blob/master/Lao-Dictionary.txt
+ # License: https://github.com/veer66/lao-dictionary/blob/master/Lao-Dictionary-LICENSE.txt
+ #              (copied below)
+ #
+ #  This file is derived from the above dictionary, with slight
+ #  modifications.
+ #  ----------------------------------------------------------------------
+ #  Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
+ #  All rights reserved.
+ #
+ #  Redistribution and use in source and binary forms, with or without
+ #  modification,
+ #  are permitted provided that the following conditions are met:
+ #
+ #
+ # Redistributions of source code must retain the above copyright notice, this
+ #  list of conditions and the following disclaimer. Redistributions in
+ #  binary form must reproduce the above copyright notice, this list of
+ #  conditions and the following disclaimer in the documentation and/or
+ #  other materials provided with the distribution.
+ #
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ # COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ # OF THE POSSIBILITY OF SUCH DAMAGE.
+ #  --------------------------------------------------------------------------
+
+4. Burmese Word Break Dictionary Data (burmesedict.txt)
+
+ #  Copyright (c) 2014 International Business Machines Corporation
+ #  and others. All Rights Reserved.
+ #
+ #  This list is part of a project hosted at:
+ #    github.com/kanyawtech/myanmar-karen-word-lists
+ #
+ #  --------------------------------------------------------------------------
+ #  Copyright (c) 2013, LeRoy Benjamin Sharon
+ #  All rights reserved.
+ #
+ #  Redistribution and use in source and binary forms, with or without
+ #  modification, are permitted provided that the following conditions
+ #  are met: Redistributions of source code must retain the above
+ #  copyright notice, this list of conditions and the following
+ #  disclaimer.  Redistributions in binary form must reproduce the
+ #  above copyright notice, this list of conditions and the following
+ #  disclaimer in the documentation and/or other materials provided
+ #  with the distribution.
+ #
+ #    Neither the name Myanmar Karen Word Lists, nor the names of its
+ #    contributors may be used to endorse or promote products derived
+ #    from this software without specific prior written permission.
+ #
+ #  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ #  CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ #  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ #  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+ #  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ #  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ #  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ #  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ #  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ #  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ #  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ #  SUCH DAMAGE.
+ #  --------------------------------------------------------------------------
+
+5. Time Zone Database
+
+  ICU uses the public domain data and code derived from Time Zone
+Database for its time zone support. The ownership of the TZ database
+is explained in BCP 175: Procedure for Maintaining the Time Zone
+Database section 7.
+
+ # 7.  Database Ownership
+ #
+ #    The TZ database itself is not an IETF Contribution or an IETF
+ #    document.  Rather it is a pre-existing and regularly updated work
+ #    that is in the public domain, and is intended to remain in the
+ #    public domain.  Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do
+ #    not apply to the TZ Database or contributions that individuals make
+ #    to it.  Should any claims be made and substantiated against the TZ
+ #    Database, the organization that is providing the IANA
+ #    Considerations defined in this RFC, under the memorandum of
+ #    understanding with the IETF, currently ICANN, may act in accordance
+ #    with all competent court orders.  No ownership claims will be made
+ #    by ICANN or the IETF Trust on the database or the code.  Any person
+ #    making a contribution to the database or code waives all rights to
+ #    future claims in that contribution or in the TZ Database.
+
+6. Google double-conversion
+
+Copyright 2006-2011, the V8 project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/output_data/iana/Android.bp b/output_data/iana/Android.bp
index 09ee9db..90b0c83 100644
--- a/output_data/iana/Android.bp
+++ b/output_data/iana/Android.bp
@@ -34,7 +34,6 @@
     name: "system_timezone_output_data_iana_license",
     visibility: [":__subpackages__"],
     license_kinds: [
-        "SPDX-license-identifier-BSD",
         "legacy_unencumbered",
     ],
     license_text: [
diff --git a/output_data/version/Android.bp b/output_data/version/Android.bp
index 076d3cf..749d132 100644
--- a/output_data/version/Android.bp
+++ b/output_data/version/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   legacy_notice
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 prebuilt_usr_share {
diff --git a/testing/Android.bp b/testing/Android.bp
index 1e92676..dd8a960 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -14,13 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-MIT
-    //   SPDX-license-identifier-Unicode-DFS
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // Library of test-support classes for tzdata updates. Shared between CTS and other tests.
diff --git a/testing/data/test1/apex/Android.bp b/testing/data/test1/apex/Android.bp
index 577f922..47622f1 100644
--- a/testing/data/test1/apex/Android.bp
+++ b/testing/data/test1/apex/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   legacy_notice
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // A test version of apex.tzdata that contains test1 data (2030a).
diff --git a/testing/data/test1/output_data/Android.bp b/testing/data/test1/output_data/Android.bp
index 390ec90..f63f4f4 100644
--- a/testing/data/test1/output_data/Android.bp
+++ b/testing/data/test1/output_data/Android.bp
@@ -14,12 +14,32 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-MIT
-    //   SPDX-license-identifier-Unicode-DFS
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+license {
+    name: "system_timezone_testing_test1_output_data_iana_licence",
+    visibility: ["//visibility:private"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "iana/NOTICE",
+    ],
+}
+
+license {
+    name: "system_timezone_testing_test1_output_data_icu_licence",
+    visibility: ["//visibility:private"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Unicode-DFS",
+    ],
+    license_text: [
+        "icu_overlay/LICENSE",
+    ],
 }
 
 prebuilt_etc {
@@ -49,6 +69,7 @@
 prebuilt_etc {
     name: "apex_tzdata_test1",
     src: "iana/tzdata",
+    licenses: ["system_timezone_testing_test1_output_data_iana_licence"],
     notice: "iana/NOTICE",
     filename: "tzdata",
     sub_dir: "tz",
@@ -58,6 +79,7 @@
 prebuilt_etc {
     name: "apex_icu_tzdata.dat_test1",
     src: "icu_overlay/icu_tzdata.dat",
+    licenses: ["system_timezone_testing_test1_output_data_icu_licence"],
     notice: "icu_overlay/LICENSE",
     filename: "icu_tzdata.dat",
     sub_dir: "icu",
diff --git a/testing/data/test3/apex/Android.bp b/testing/data/test3/apex/Android.bp
index 2ae27d7..69f0225 100644
--- a/testing/data/test3/apex/Android.bp
+++ b/testing/data/test3/apex/Android.bp
@@ -14,10 +14,7 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   legacy_notice
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // A test version of apex.tzdata that contains corrupt data.
diff --git a/testing/data/test3/output_data/Android.bp b/testing/data/test3/output_data/Android.bp
index 3b70586..e22d485 100644
--- a/testing/data/test3/output_data/Android.bp
+++ b/testing/data/test3/output_data/Android.bp
@@ -14,12 +14,32 @@
 
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-MIT
-    //   SPDX-license-identifier-Unicode-DFS
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+license {
+    name: "system_timezone_testing_test3_output_data_iana_licence",
+    visibility: ["//visibility:private"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "iana/NOTICE",
+    ],
+}
+
+license {
+    name: "system_timezone_testing_test3_output_data_icu_licence",
+    visibility: ["//visibility:private"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Unicode-DFS",
+    ],
+    license_text: [
+        "icu_overlay/LICENSE",
+    ],
 }
 
 prebuilt_etc {
@@ -49,6 +69,7 @@
 prebuilt_etc {
     name: "apex_tzdata_test3",
     src: "iana/tzdata",
+    licenses: ["system_timezone_testing_test3_output_data_iana_licence"],
     notice: "iana/NOTICE",
     filename: "tzdata",
     sub_dir: "tz",
@@ -58,6 +79,7 @@
 prebuilt_etc {
     name: "apex_icu_tzdata.dat_test3",
     src: "icu_overlay/icu_tzdata.dat",
+    licenses: ["system_timezone_testing_test3_output_data_icu_licence"],
     notice: "icu_overlay/LICENSE",
     filename: "icu_tzdata.dat",
     sub_dir: "icu",
diff --git a/tzdatacheck/Android.bp b/tzdatacheck/Android.bp
index 14736bc..693f94d 100644
--- a/tzdatacheck/Android.bp
+++ b/tzdatacheck/Android.bp
@@ -1,9 +1,6 @@
 package {
     // http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "system_timezone_license":
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_timezone_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 // ========================================================