diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:32:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:32:10 +0000 |
| commit | 37f9ff93c0e3789ad4e135dd8396b4c20327b7ad (patch) | |
| tree | d4331fc0ae40bfa56d8e3a9f2b73f914383f3447 | |
| parent | 0d711d32c8fb9271f663cbacfa572b170fab85a4 (diff) | |
| parent | 7cc797d01e828f76864e9f59c165cbd1950b6f29 (diff) | |
| download | mio-37f9ff93c0e3789ad4e135dd8396b4c20327b7ad.tar.gz | |
Generate apex_available from c2a instead of a patch am: 8ac1c616dc am: c20f8c696b am: 63045bde98 am: 7cc797d01e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mio/+/1688984
Change-Id: Idc24e88e75a6b41f01b2a4e0e622ba7cbcbe3774
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android.json | 11 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 14 |
3 files changed, 13 insertions, 16 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --features os-poll,tcp,udp,uds,os-util --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 { @@ -46,5 +46,5 @@ rust_library { // dependent_library ["feature_list"] // cfg-if-1.0.0 -// libc-0.2.92 "default,std" +// libc-0.2.94 "default,std" // log-0.4.14 "std" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..86c4a39 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "features": "os-poll,tcp,udp,uds,os-util", + "min-sdk-version": "29", + "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 a4582df..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Android.bp 2020-12-21 02:15:37.110815320 +0900 -+++ Android.bp.new 2020-12-19 19:18:22.394348931 +0900 -@@ -19,6 +19,11 @@ rust_library { - "liblibc", - "liblog_rust", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - // dependent_library ["feature_list"] |