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 | 0401deecf21095ede3da2b0e5e8518450f5a94b8 (patch) | |
| tree | 2077859b560ef35ea3a363d60b91ec78db6d30b8 | |
| parent | 713fe676aead93ff4850060a7371dd6c8667bf39 (diff) | |
| parent | 1fa5ab1d817eec1e36ac1e5f46a66cf67cd990a1 (diff) | |
| download | num_cpus-0401deecf21095ede3da2b0e5e8518450f5a94b8.tar.gz | |
Use new cargo2android.py feature to remove part of a patch. am: ca3b941637 am: 1fa5ab1d81
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/1943396
Change-Id: Ibd073d4621082ed0eef6e6690797439c570a64a0
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 1 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 11 |
3 files changed, 5 insertions, 10 deletions
@@ -66,6 +66,9 @@ rust_test { srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: false, + }, edition: "2015", rustlibs: [ "liblibc", diff --git a/cargo2android.json b/cargo2android.json index 88e1492..dbeac24 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -9,6 +9,7 @@ "dependencies": true, "device": true, "min-sdk-version": "29", + "no-presubmit": true, "patch": "patches/Android.bp.patch", "run": true, "tests": true diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 72eef69..04bbbda 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,7 +2,7 @@ diff --git a/Android.bp b/Android.bp index a441683..8f89a16 100644 --- a/Android.bp +++ b/Android.bp -@@ -59,16 +59,12 @@ rust_library { +@@ -59,7 +59,6 @@ rust_library { rust_test { name: "num_cpus_test_src_lib", @@ -10,12 +10,3 @@ index a441683..8f89a16 100644 crate_name: "num_cpus", cargo_env_compat: true, cargo_pkg_version: "1.13.0", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, -- test_options: { -- unit_test: true, -- }, - edition: "2015", - rustlibs: [ - "liblibc", |