Backport textwrap update
The 2.x branch of clap is not supported upstream. Backport the upgrade
to the new version of textwrap until 3.x is officially released.
Based on https://github.com/clap-rs/clap/pull/2324.
Test: mm
Bug: 178357400
Change-Id: I7c0419965db181b00bb9ff59a7e61dc7f77675ca
diff --git a/Android.bp b/Android.bp
index 8180599..2edc035 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,34 +1,5 @@
// This file is generated by cargo2android.py --run --dependencies --features= --device.
-
-package {
- default_applicable_licenses: ["external_rust_crates_clap_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.
-// See: http://go/android-license-faq
-license {
- name: "external_rust_crates_clap_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-MIT",
- ],
- license_text: [
- "LICENSE-MIT",
- ],
-}
+// Do not modify this file as changes will be overridden on upgrade.
rust_library {
name: "libclap",
@@ -40,11 +11,9 @@
rustlibs: [
"libbitflags",
"libtextwrap",
- "libunicode_width",
],
}
// dependent_library ["feature_list"]
// bitflags-1.2.1 "default"
-// textwrap-0.11.0
-// unicode-width-0.1.8 "default"
+// textwrap-0.13.3
