Use new cargo2android.py feature to remove part of a patch.
Test: Run cargo2android.py.
Change-Id: I370d35ba4fcb4dd0479d3e55943b1bd11ba17e81
diff --git a/Android.bp b/Android.bp
index fe4a0b8..c0467cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,6 +66,9 @@
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 @@
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 @@
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",
