commit 87bfaab0946d08a58dbd47664ddbf851ab7a0dcc
author Ivan Lozano <ivanlozano@google.com> Fri Jul 08 17:10:49 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 08 17:10:49 2022 +0000
tree 131ff9aa27cabc7f89bd5125f713a1deaa578eb2
parent f179c0882f0261490dc3cd0a515b4c60560943f7
parent 45da455be5efc6cf3b180d0a661fca9277328b6d

Revert "Enable tests" am: 1c39579252 am: ac43ee9174 am: f085ef723e am: 45da455be5

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2148933

Change-Id: I70cd3d790e5186bc6d55d34f7ff938619900d728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 9b8e68b..d5c31aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,76 +63,3 @@
     ],
 }
 
-rust_test {
-    name: "rusqlite_test_src_lib",
-    host_supported: true,
-    crate_name: "rusqlite",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.27.0",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2018",
-    features: [
-        "modern_sqlite",
-        "trace",
-    ],
-    rustlibs: [
-        "libbencher",
-        "libbitflags",
-        "libfallible_iterator",
-        "libfallible_streaming_iterator",
-        "libhashlink",
-        "liblazy_static",
-        "liblibsqlite3_sys",
-        "libmemchr",
-        "libregex",
-        "libsmallvec",
-        "libtempfile",
-        "libuuid",
-    ],
-}
-
-rust_defaults {
-    name: "rusqlite_test_defaults",
-    crate_name: "rusqlite",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.27.0",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    features: [
-        "modern_sqlite",
-        "trace",
-    ],
-    rustlibs: [
-        "libbencher",
-        "libbitflags",
-        "libfallible_iterator",
-        "libfallible_streaming_iterator",
-        "libhashlink",
-        "liblazy_static",
-        "liblibsqlite3_sys",
-        "libmemchr",
-        "libregex",
-        "librusqlite",
-        "libsmallvec",
-        "libtempfile",
-        "libuuid",
-    ],
-}
-
-rust_test {
-    name: "rusqlite_test_tests_deny_single_threaded_sqlite_config",
-    defaults: ["rusqlite_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/deny_single_threaded_sqlite_config.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 429f33b..aa301aa 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -9,12 +9,6 @@
     },
     {
       "name": "legacykeystore_test"
-    },
-    {
-      "name": "rusqlite_test_src_lib"
-    },
-    {
-      "name": "rusqlite_test_tests_deny_single_threaded_sqlite_config"
     }
   ],
   "presubmit-rust": [
@@ -26,12 +20,6 @@
     },
     {
       "name": "legacykeystore_test"
-    },
-    {
-      "name": "rusqlite_test_src_lib"
-    },
-    {
-      "name": "rusqlite_test_tests_deny_single_threaded_sqlite_config"
     }
   ]
 }

cargo2android-extra-module.bp

diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp
index e8f1ccc..33222cb 100644
--- a/cargo2android-extra-module.bp
+++ b/cargo2android-extra-module.bp
@@ -19,75 +19,3 @@
         "libsmallvec",
     ],
 }
-
-rust_test {
-    name: "rusqlite_test_src_lib",
-    host_supported: true,
-    crate_name: "rusqlite",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.27.0",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2018",
-    features: [
-        "modern_sqlite",
-        "trace",
-    ],
-    rustlibs: [
-        "libbencher",
-        "libbitflags",
-        "libfallible_iterator",
-        "libfallible_streaming_iterator",
-        "libhashlink",
-        "liblazy_static",
-        "liblibsqlite3_sys",
-        "libmemchr",
-        "libregex",
-        "libsmallvec",
-        "libtempfile",
-        "libuuid",
-    ],
-}
-
-rust_defaults {
-    name: "rusqlite_test_defaults",
-    crate_name: "rusqlite",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.27.0",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    features: [
-        "modern_sqlite",
-        "trace",
-    ],
-    rustlibs: [
-        "libbencher",
-        "libbitflags",
-        "libfallible_iterator",
-        "libfallible_streaming_iterator",
-        "libhashlink",
-        "liblazy_static",
-        "liblibsqlite3_sys",
-        "libmemchr",
-        "libregex",
-        "librusqlite",
-        "libsmallvec",
-        "libtempfile",
-        "libuuid",
-    ],
-}
-
-rust_test {
-    name: "rusqlite_test_tests_deny_single_threaded_sqlite_config",
-    defaults: ["rusqlite_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/deny_single_threaded_sqlite_config.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}