Snap for 8426163 from c6c36df1fce6e8d61865d934d405804b1e2893ed to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: Idf52969d2c8f65d43ded3b270640df753e0c4615

3 files changed, 42 insertions, 46 deletions

diff --git a/Android.bp b/Android.bp
index a4fc80f..21d7bfa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,40 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["external_bzip2_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 filtered out the below license kinds as false-positives:
-//   SPDX-license-identifier-GPL
-//   SPDX-license-identifier-OFL
-// See: http://go/android-license-faq
-license {
-    name: "external_bzip2_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_library_static {
     name: "libbz",
     host_supported: true,
@@ -56,7 +22,6 @@ cc_library_static {
         "//external/bsdiff:__subpackages__",
         "//external/puffin:__subpackages__",
         "//system/update_engine:__subpackages__",
-        "//system/core/fs_mgr/libsnapshot:__subpackages__",
     ],
     arch: {
         arm: {
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 3cd3d0d..0000000
--- a/METADATA
+++ /dev/null
@@ -1,11 +0,0 @@
-name: "bzip2"
-
-third_party {
-  url {
-    type: GIT
-    value: "https://sourceware.org/git/bzip2.git"
-  }
-  version: "bzip2-1.0.8"
-  license_type: NOTICE
-  last_upgrade_date { year: 2021 month: 2 day: 8 }
-}
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..cc61417
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,42 @@
+
+--------------------------------------------------------------------------
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2010 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must 
+   not claim that you wrote the original software.  If you use this 
+   software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+Julian Seward, jseward@bzip.org
+bzip2/libbzip2 version 1.0.6 of 6 September 2010
+
+--------------------------------------------------------------------------