Merge 71ebbee24d93dda9944593b1155d7dd75ad39e04 on remote branch
Change-Id: I77b454e03447be7f1e0689fae5e411f6952792c3
diff --git a/Android.bp b/Android.bp
index 8b145a9..06ca975 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,33 +50,8 @@
],
apex_available: [
"//apex_available:platform",
+ "com.android.bluetooth",
"com.android.virt",
],
-}
-
-rust_defaults {
- name: "lock_api_test_defaults",
- crate_name: "lock_api",
- srcs: ["src/lib.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "0.4.5",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2018",
- rustlibs: [
- "libscopeguard",
- ],
-}
-
-rust_test_host {
- name: "lock_api_host_test_src_lib",
- defaults: ["lock_api_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "lock_api_device_test_src_lib",
- defaults: ["lock_api_test_defaults"],
+ min_sdk_version: "29",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d3f0059..f439cf8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,8 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "presubmit": [
+ "imports": [
{
- "name": "lock_api_device_test_src_lib"
+ "path": "external/rust/crates/vulkano"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index d28888a..22531ba 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,9 +1,11 @@
{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "device": true,
- "run": true,
- "tests": true
-}
\ No newline at end of file
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.bluetooth",
+ "com.android.virt"
+ ],
+ "device": true,
+ "min-sdk-version": "29",
+ "run": true,
+ "tests": true
+}