Merge "Snap for 7183507 from 3881c145da152c2a3250ed9d4eb50891ab319777 to sdk-release" into sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1

2 files changed, 42 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 9cd6850..a4fc80f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,40 @@
 // 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,
diff --git a/METADATA b/METADATA
index d97975c..3cd3d0d 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,11 @@
+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 }
 }