diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-07-21 14:59:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-21 14:59:12 +0000 |
| commit | d8126c28950fc59cc88640907a708525c0fd638b (patch) | |
| tree | 155834ff3dedf2bb66e299fbfe3134c683fff68b | |
| parent | ea87a8b498c1588b2ba04a1126c84616a0a6e24f (diff) | |
| parent | cb7ed80bf9a5caab80189141d15ac86863a4f327 (diff) | |
| download | xml-rs-d8126c28950fc59cc88640907a708525c0fd638b.tar.gz | |
Use cargo2android.py feature to remove a patch. am: 5d1abedb86 am: 4fec78a5bc am: cb7ed80bf9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/xml-rs/+/1773005
Change-Id: I6cff25a8a982c70ee259adab42755b1947e11d0f
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 20 |
2 files changed, 4 insertions, 22 deletions
diff --git a/cargo2android.json b/cargo2android.json index d63dca0..24ca9c1 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -8,6 +8,8 @@ ], "device": true, "run": true, - "tests": true, - "patch": "patches/Android.bp.patch" + "test-data": [ + "tests/event_writer.rs=tests/documents/*" + ], + "tests": true }
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 465a940..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 15bae6d..2800012 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -107,6 +107,7 @@ rust_test_host { - test_options: { - unit_test: true, - }, -+ data: ["tests/documents/*"], - } - - rust_test { -@@ -114,6 +115,7 @@ rust_test { - defaults: ["xml-rs_test_defaults_xml_rs"], - // has rustc warnings - srcs: ["tests/event_writer.rs"], -+ data: ["tests/documents/*"], - } - - rust_test_host { |