Snap for 8189365 from 8807a59a90cf6b23f30330e43d5ee26dded503a9 to tm-frc-neuralnetworks-release

Change-Id: I9448ed6a3b20537e4440190779e00a3b42d2a7d4

3 files changed, 7 insertions, 88 deletions

diff --git a/Android.bp b/Android.bp
index 027e256..aea33a1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --run --device --dependencies.
 
 package {
     default_applicable_licenses: ["external_rust_crates_crc32fast_license"],
@@ -37,50 +36,23 @@ license {
     ],
 }
 
-rust_test {
-    name: "crc32fast_test_src_lib",
-    host_supported: true,
-    crate_name: "crc32fast",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.2.1",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2015",
-    features: [
-        "default",
-        "std",
-    ],
-    cfgs: ["crc32fast_stdarchx86"],
-    rustlibs: [
-        "libbencher",
-        "libcfg_if",
-        "libquickcheck",
-        "librand",
-    ],
-}
-
 rust_library {
     name: "libcrc32fast",
     host_supported: true,
     crate_name: "crc32fast",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.2.1",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
         "default",
         "std",
     ],
-    cfgs: ["crc32fast_stdarchx86"],
+    flags: [
+        "--cfg crc32fast_stdarchx86",
+    ],
     rustlibs: [
         "libcfg_if",
     ],
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.virt",
-    ],
 }
+
+// dependent_library ["feature_list"]
+//   cfg-if-1.0.0
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index a46d45f..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "crc32fast_test_src_lib"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "crc32fast_test_src_lib"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index ac56e26..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file