diff options
| author | Joel Galenson <jgalenson@google.com> | 2022-01-10 20:56:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-10 20:56:56 +0000 |
| commit | 4f62bdccde9e4cf3cc0cee85fc4dac53f6f3ce92 (patch) | |
| tree | 881b939d5cde9cdea5e2fce1b50008da8e6dd8ce | |
| parent | dcf0bf827a8429c8386eb2c114c4f6c89377b44f (diff) | |
| parent | eeb6a09c887fd7d6a81a0fbdfc3b01be45c608bb (diff) | |
| download | shared_library-4f62bdccde9e4cf3cc0cee85fc4dac53f6f3ce92.tar.gz | |
Use new cargo2android.py feature to remove a patch. am: eef57dbf37 am: 9c10e70c46 am: eeb6a09c88
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_library/+/1943944
Change-Id: Iecacf32b99ccf4ccd45684f48a7c7eb412df3669
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 2 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 17 |
3 files changed, 1 insertions, 20 deletions
@@ -66,8 +66,6 @@ rust_test { srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - // Manually disabled as these tests depend on specific graphics libraries - // being available on the machine running the tests. test_options: { unit_test: false, }, diff --git a/cargo2android.json b/cargo2android.json index bbea40c..6e68088 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,7 +4,7 @@ "com.android.virt" ], "device": true, - "patch": "patches/Android.bp.patch", + "no-presubmit": true, "run": true, "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 32794df..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 3e82eff..550133f 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -35,9 +35,11 @@ rust_test { - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, -+ // Manually disabled as these tests depend on specific graphics libraries -+ // being available on the machine running the tests. - test_options: { -- unit_test: true, -+ unit_test: false, - }, - edition: "2015", - rustlibs: [ - |