diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-15 04:05:53 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-15 04:05:53 +0000 |
commit | fea223968d2e29a08a41343fdb5694e60b2993a7 (patch) | |
tree | d0c4c287d0c7119e30981c83b1f74c3d928e0a27 | |
parent | 39d360b4b1f6ee1581a14b88e7e0c0addb55165d (diff) | |
parent | 6b4a1303bbbf49ed47f3c3a47212a81f90330b69 (diff) | |
download | lock_api-fea223968d2e29a08a41343fdb5694e60b2993a7.tar.gz |
Snap for 8183730 from 6b4a1303bbbf49ed47f3c3a47212a81f90330b69 to udc-release
Change-Id: I63a1b864d2ac4d376269945a7350f01d0289bf84
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | TEST_MAPPING | 4 | ||||
-rw-r--r-- | cargo2android.json | 18 |
3 files changed, 14 insertions, 37 deletions
@@ -50,33 +50,8 @@ rust_library { ], 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 +} |