diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-07 22:29:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-07 22:29:05 +0000 |
| commit | 3fefaa7f3a4d7c88aae5a35d3267f7e8c5deb96f (patch) | |
| tree | 20891774fc80a5f8c9957689803d2f07d5ed93e0 | |
| parent | 6c6796b9a7e7ddc92586d2c6bf282b3c4928d054 (diff) | |
| parent | 93ff97d59617b002031902ad71930a5a127ee566 (diff) | |
| download | intrusive-collections-3fefaa7f3a4d7c88aae5a35d3267f7e8c5deb96f.tar.gz | |
Remove patch. am: 1762da573d am: 93ff97d596
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/intrusive-collections/+/1729711
Change-Id: Iae27770cf357a92d09ede4078261fc9767df41fc
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 1 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 12 |
3 files changed, 0 insertions, 15 deletions
@@ -1,7 +1,5 @@ // This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. -// TODO(victorhsieh): Add --test. The test in the current version depends on an older rand crate -// (pre 0.8) to compile due to several API changes. However, Android's rand is already newer. package { default_applicable_licenses: [ diff --git a/cargo2android.json b/cargo2android.json index 623aa56..42b7833 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,6 +5,5 @@ ], "dependencies": true, "device": true, - "patch": "patches/Android.bp.patch", "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 f0c7569..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 9e3c084..d4334b6 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -1,5 +1,7 @@ - // This file is generated by cargo2android.py --config cargo2android.json. - // Do not modify this file as changes will be overridden on upgrade. -+// TODO(victorhsieh): Add --test. The test in the current version depends on an older rand crate -+// (pre 0.8) to compile due to several API changes. However, Android's rand is already newer. - - package { - default_applicable_licenses: [ |