diff options
author | Joel Galenson <jgalenson@google.com> | 2021-05-27 09:27:17 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-05-27 09:32:12 -0700 |
commit | 662a5f32588f5e1d234eaab9fa6643962c8cb042 (patch) | |
tree | 538677805259795387204a13257d9c638f6aa450 | |
parent | 310e1bb47be4e9904285df0ccbbb5e612868fd95 (diff) | |
download | rand-662a5f32588f5e1d234eaab9fa6643962c8cb042.tar.gz |
Remove unneeded patch
The patch seems to fail to apply during cargo2android.py.
I'm also migrating to a config file while I'm at it.
Test: Run updater.
Change-Id: Ib305a6193ab39e4776df4b023cc77db590a60fb3
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | cargo2android.json | 5 | ||||
-rw-r--r-- | patches/Android.bp.patch | 12 |
3 files changed, 8 insertions, 18 deletions
@@ -1,8 +1,6 @@ -// This file is generated by cargo2android.py --device --run --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 { default_applicable_licenses: ["external_rust_crates_rand_license"], } @@ -65,9 +63,8 @@ rust_library { // dependent_library ["feature_list"] // cfg-if-1.0.0 -// getrandom-0.2.2 "std" -// libc-0.2.93 +// getrandom-0.2.3 "std" +// libc-0.2.95 // ppv-lite86-0.2.10 "simd,std" // rand_chacha-0.3.0 "std" // rand_core-0.6.2 "alloc,getrandom,std" -// rand_hc-0.3.0 diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..1b6cca2 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "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 59579a5..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 49626bd..5c40f99 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -23,7 +23,6 @@ rust_library { - "liblibc", - "librand_chacha", - "librand_core", -- "librand_hc", - ], - } - |