diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-05-26 15:04:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-26 15:04:48 +0000 |
| commit | 7001a3649beb19006272aa52d3e85e6557b3bef9 (patch) | |
| tree | 102448e3d36fca9170dc1e64d19972aadd3a2bf8 | |
| parent | f1c6cfdf93be68f576e7801d164a07de0cb1881c (diff) | |
| parent | ba2363de4f598fe3e212654921422fa6a32bc413 (diff) | |
| download | command-fds-7001a3649beb19006272aa52d3e85e6557b3bef9.tar.gz | |
Merge "Remove unneeded patch." am: 4466549bb9 am: 713e6b824c am: 95e274cbfc am: ba2363de4f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/command-fds/+/1718371
Change-Id: I97ae5a2e14d00de33835a68b0869ae138bc752d9
| -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. @@ -39,11 +39,11 @@ rust_library { // dependent_library ["feature_list"] // bitflags-1.2.1 "default" // cfg-if-1.0.0 -// libc-0.2.94 "default,extra_traits,std" +// libc-0.2.95 "default,extra_traits,std" // nix-0.20.0 -// proc-macro2-1.0.26 "default,proc-macro" +// proc-macro2-1.0.27 "default,proc-macro" // quote-1.0.9 "default,proc-macro" // syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote" -// thiserror-1.0.24 -// thiserror-impl-1.0.24 +// thiserror-1.0.25 +// thiserror-impl-1.0.25 // unicode-xid-0.2.2 "default" 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 94c1fcc..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 0a57129..a6ff574 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -39,6 +39,10 @@ rust_library { - "libnix", - "libthiserror", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |