diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:42 +0000 |
commit | 892dbbf7fa26c93d4ec6f852f0dd6c8f5026805a (patch) | |
tree | a1f2b136f0951447ee26fd070ec1044f092023a7 | |
parent | 32ee6d776cafd883e79826fe47b6ce4c281caa82 (diff) | |
parent | 3d54d6c5d6ba2959edbe78dc89055737e45b1972 (diff) | |
download | structopt-892dbbf7fa26c93d4ec6f852f0dd6c8f5026805a.tar.gz |
Generate apex_available from c2a instead of a patch am: a4c43fafd2 am: d1bb8b6b84 am: 3d54d6c5d6android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt/+/1689919
Change-Id: Ic378b1094830f1705e41f8bde17992f6e73df703
-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"] |