diff options
| author | Victor Hsieh <victorhsieh@google.com> | 2021-03-15 17:24:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-15 17:24:50 +0000 |
| commit | 7cd8c0c0a3ab60a27c17bf49c12e9bae70e73fec (patch) | |
| tree | 6c3afa3ae1368d57850eba6b17fc94eb4386a3f6 | |
| parent | f3405f329cf62b5ca921dbfaea266aa1dd54e2be (diff) | |
| parent | 4d9e408569bcfeb67c3cd8da1f350db98af52aa6 (diff) | |
| download | textwrap-7cd8c0c0a3ab60a27c17bf49c12e9bae70e73fec.tar.gz | |
Allow textwrap crate in com.android.virt apex am: 59ca1d53d8 am: 4d9e408569
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/textwrap/+/1633640
Change-Id: Ic8dd72a5982d4fcb45dff70af982e0fdac2b7249
| -rw-r--r-- | Android.bp | 23 | ||||
| -rw-r--r-- | TEST_MAPPING | 3 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 21 insertions, 18 deletions
@@ -1,27 +1,14 @@ -// This file is generated by cargo2android.py --run --dependencies --device --features=. +// This file is generated by cargo2android.py --run --dependencies --device --features= --patch=patches/Android.bp.patch. // Do not modify this file as changes will be overridden on upgrade. -package { - default_applicable_licenses: ["external_rust_crates_textwrap_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "external_rust_crates_textwrap_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-MIT", - ], - license_text: [ - "LICENSE", - ], -} - rust_library { name: "libtextwrap", host_supported: true, crate_name: "textwrap", srcs: ["src/lib.rs"], edition: "2018", + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } diff --git a/TEST_MAPPING b/TEST_MAPPING index f1cd786..661ac5c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -5,6 +5,9 @@ "name": "authfs_device_test_src_lib" }, { + "name": "vpnprofilestore_test" + }, + { "name": "keystore2_test" }, { diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..356e1c2 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,13 @@ +diff --git a/Android.bp b/Android.bp +index f879002..893238d 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -7,4 +7,8 @@ rust_library { + crate_name: "textwrap", + srcs: ["src/lib.rs"], + edition: "2018", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } |