diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 02:41:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 02:41:33 +0000 |
commit | a662ddf76cafd85a058315860fadcfb8bd36de09 (patch) | |
tree | a1f2b136f0951447ee26fd070ec1044f092023a7 | |
parent | fba6a707c89709c5d333c5ce3d43d27c4b005648 (diff) | |
parent | 4c015befc85aa512688fb8a12892d959ae61a18f (diff) | |
download | structopt-android12-gsi.tar.gz |
Snap for 7325276 from 892dbbf7fa26c93d4ec6f852f0dd6c8f5026805a to sc-release am: 4c015befc8android12-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/structopt/+/14371520
Change-Id: I68db3d87a0213af419f1427a4e9d705a145439f4
-rw-r--r-- | Android.bp | 10 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 14 insertions, 20 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -62,17 +62,17 @@ rust_library { // clap-2.33.3 "ansi_term,atty,color,default,strsim,suggestions,vec_map" // heck-0.3.2 // lazy_static-1.4.0 -// libc-0.2.88 +// libc-0.2.94 // proc-macro-error-1.0.4 "default,syn,syn-error" // proc-macro-error-attr-1.0.4 -// proc-macro2-1.0.24 "default,proc-macro" +// proc-macro2-1.0.26 "default,proc-macro" // quote-1.0.9 "default,proc-macro" // strsim-0.8.0 // structopt-derive-0.4.14 -// syn-1.0.63 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" +// syn-1.0.71 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" // textwrap-0.11.0 // unicode-segmentation-1.7.1 // unicode-width-0.1.8 "default" // unicode-xid-0.2.1 "default" // vec_map-0.8.2 -// version_check-0.9.2 +// version_check-0.9.3 diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..42b7833 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 979197c..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 2695275..01ae097 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -13,6 +13,10 @@ rust_library { - "liblazy_static", - ], - proc_macros: ["libstructopt_derive"], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |