diff options
| author | Joel Galenson <jgalenson@google.com> | 2022-01-10 20:38:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-10 20:38:57 +0000 |
| commit | 4e371065d91beadc5e74c9c8f9a2ad8338d4e2e3 (patch) | |
| tree | 046cf1f0b6bd76294d586fd4de7ba1e9cc500f71 | |
| parent | 9935998aa7b73ca614507f0991a5673660bde76b (diff) | |
| parent | 8018918c1b2870a3415c6c41a917cc749314def2 (diff) | |
| download | vulkano-4e371065d91beadc5e74c9c8f9a2ad8338d4e2e3.tar.gz | |
Use new cargo2android.py feature to remove a patch. am: 9d31388ac4 am: 8018918c1b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vulkano/+/1943368
Change-Id: I41fca1b58eb9be940b549cf2cfc9cc621b8258f9
| -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
@@ -83,8 +83,6 @@ rust_test { ], 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 ea92969..6dee77b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,7 +5,7 @@ ], "copy-out": true, "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 669a5e8..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 8e11707..a156cb8 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -62,9 +62,11 @@ rust_test { - ], - 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: "2018", - rustlibs: [ - |