From 552c9078a12efbfa8274260cbdb4e4b93bbd4653 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 23 Aug 2021 09:56:58 -0700 Subject: Update TEST_MAPPING Test: None Change-Id: I94ed7415c09ccf24e1b2462f245e7543370a8584 --- TEST_MAPPING | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index aa4ba0b..163c17e 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,11 +1,74 @@ -// Generated by cargo2android.py for tests in Android.bp +// Generated by update_crate_tests.py for tests that depend on this crate. { "presubmit": [ + { + "name": "apkdmverity.test" + }, + { + "name": "base64_device_test_tests_decode" + }, + { + "name": "base64_device_test_tests_encode" + }, + { + "name": "base64_device_test_tests_helpers" + }, + { + "name": "gdbstub_arch_device_test_src_lib" + }, + { + "name": "libapkverify.integration_test" + }, + { + "name": "libapkverify.test" + }, + { + "name": "libidsig.test" + }, + { + "name": "microdroid_manager_test" + }, + { + "name": "num-bigint_device_test_src_lib" + }, + { + "name": "num-bigint_device_test_tests_bigint" + }, + { + "name": "num-bigint_device_test_tests_bigint_bitwise" + }, + { + "name": "num-bigint_device_test_tests_bigint_scalar" + }, + { + "name": "num-bigint_device_test_tests_biguint" + }, + { + "name": "num-bigint_device_test_tests_biguint_scalar" + }, + { + "name": "num-bigint_device_test_tests_modpow" + }, + { + "name": "num-bigint_device_test_tests_roots" + }, { "name": "num-traits_device_test_src_lib" }, { "name": "num-traits_device_test_tests_cast" + }, + { + "name": "oid-registry_device_test_src_lib" + }, + { + "name": "unicode-xid_device_test_src_lib" + }, + { + "name": "unicode-xid_device_test_tests_exhaustive_tests" + }, + { + "name": "virtualizationservice_device_test" } ] } -- cgit v1.2.3 From 92b538c1ff18d435327fe30ae534d395006d2be7 Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Thu, 16 Sep 2021 11:04:53 +0100 Subject: Allow CompOS access to num-traits Bug: 186126194 Test: Run odrefresh from composd via composd_cmd Change-Id: I655ab464d49723b9e7022390222170c18507b5dd --- Android.bp | 1 + cargo2android.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 4a33246..ac05f3c 100644 --- a/Android.bp +++ b/Android.bp @@ -53,6 +53,7 @@ rust_library { ], apex_available: [ "//apex_available:platform", + "com.android.compos", "com.android.virt", ], } diff --git a/cargo2android.json b/cargo2android.json index ac56e26..0e54308 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,10 +1,11 @@ { "apex-available": [ "//apex_available:platform", + "com.android.compos", "com.android.virt" ], "dependencies": true, "device": true, "run": true, "tests": true -} \ No newline at end of file +} -- cgit v1.2.3 From 68156d837a607928b8b684bf236029b62098727f Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Tue, 30 Nov 2021 10:30:09 -0800 Subject: Add apex_available Test: TreeHugger Change-Id: I5dfd11e6b51ebadbf429700ff45d2a8983779fea --- Android.bp | 2 ++ cargo2android.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Android.bp b/Android.bp index ac05f3c..8bf649d 100644 --- a/Android.bp +++ b/Android.bp @@ -54,8 +54,10 @@ rust_library { apex_available: [ "//apex_available:platform", "com.android.compos", + "com.android.uwb", "com.android.virt", ], + min_sdk_version: "29", } rust_defaults { diff --git a/cargo2android.json b/cargo2android.json index 0e54308..95f150b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -2,10 +2,12 @@ "apex-available": [ "//apex_available:platform", "com.android.compos", + "com.android.uwb", "com.android.virt" ], "dependencies": true, "device": true, + "min_sdk_version": "29", "run": true, "tests": true } -- cgit v1.2.3 From 6c7c9a1684d7d6e5355ea84280489e044bcff523 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:04:31 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: I9ced66cd88d4aca7f4a7327eba594542990629ad --- Android.bp | 49 +++++++++++++++++------------------------------- TEST_MAPPING | 55 ++++++++++++++++++++++++++++++------------------------ cargo2android.json | 2 +- 3 files changed, 49 insertions(+), 57 deletions(-) diff --git a/Android.bp b/Android.bp index 8bf649d..8cbc204 100644 --- a/Android.bp +++ b/Android.bp @@ -41,6 +41,8 @@ rust_library { name: "libnum_traits", host_supported: true, crate_name: "num_traits", + cargo_env_compat: true, + cargo_pkg_version: "0.2.14", srcs: ["src/lib.rs"], edition: "2015", features: [ @@ -60,12 +62,18 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "num-traits_defaults", +rust_test { + name: "num-traits_test_src_lib", + host_supported: true, crate_name: "num_traits", + cargo_env_compat: true, + cargo_pkg_version: "0.2.14", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -77,25 +85,18 @@ rust_defaults { ], } -rust_test_host { - name: "num-traits_host_test_src_lib", - defaults: ["num-traits_defaults"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "num-traits_device_test_src_lib", - defaults: ["num-traits_defaults"], -} - -rust_defaults { - name: "num-traits_defaults_cast", + name: "num-traits_test_tests_cast", + host_supported: true, crate_name: "cast", + cargo_env_compat: true, + cargo_pkg_version: "0.2.14", srcs: ["tests/cast.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -109,19 +110,3 @@ rust_defaults { "libnum_traits", ], } - -rust_test_host { - name: "num-traits_host_test_tests_cast", - defaults: ["num-traits_defaults_cast"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "num-traits_device_test_tests_cast", - defaults: ["num-traits_defaults_cast"], -} - -// dependent_library ["feature_list"] -// autocfg-1.0.1 diff --git a/TEST_MAPPING b/TEST_MAPPING index 163c17e..3250256 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,71 +1,78 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "apkdmverity.test" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/gdbstub_arch" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/num-bigint" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/num-integer" }, { - "name": "gdbstub_arch_device_test_src_lib" + "path": "external/rust/crates/oid-registry" }, { - "name": "libapkverify.integration_test" + "path": "external/rust/crates/tinytemplate" }, { - "name": "libapkverify.test" + "path": "external/rust/crates/tinyvec" }, { - "name": "libidsig.test" - }, + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ { - "name": "microdroid_manager_test" + "name": "apkdmverity.test" }, { - "name": "num-bigint_device_test_src_lib" + "name": "libapkverify.integration_test" }, { - "name": "num-bigint_device_test_tests_bigint" + "name": "libapkverify.test" }, { - "name": "num-bigint_device_test_tests_bigint_bitwise" + "name": "libidsig.test" }, { - "name": "num-bigint_device_test_tests_bigint_scalar" + "name": "microdroid_manager_test" }, { - "name": "num-bigint_device_test_tests_biguint" + "name": "num-traits_test_src_lib" }, { - "name": "num-bigint_device_test_tests_biguint_scalar" + "name": "num-traits_test_tests_cast" }, { - "name": "num-bigint_device_test_tests_modpow" + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "apkdmverity.test" }, { - "name": "num-bigint_device_test_tests_roots" + "name": "libapkverify.integration_test" }, { - "name": "num-traits_device_test_src_lib" + "name": "libapkverify.test" }, { - "name": "num-traits_device_test_tests_cast" + "name": "libidsig.test" }, { - "name": "oid-registry_device_test_src_lib" + "name": "microdroid_manager_test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "num-traits_test_src_lib" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "num-traits_test_tests_cast" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 95f150b..9a21b76 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -10,4 +10,4 @@ "min_sdk_version": "29", "run": true, "tests": true -} +} \ No newline at end of file -- cgit v1.2.3 From 7fc63fa7d6cce0a3f6542dc53fc873dff8f22d0d Mon Sep 17 00:00:00 2001 From: Roopa Sattiraju Date: Tue, 21 Dec 2021 15:21:41 -0800 Subject: Adding bluetooth apex Bug: 206121418 Test: Compile Change-Id: I9602830da1debfad4a4be3df6f86f0c6aaebd1ea --- Android.bp | 1 + cargo2android.json | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index 8cbc204..b935c29 100644 --- a/Android.bp +++ b/Android.bp @@ -55,6 +55,7 @@ rust_library { ], apex_available: [ "//apex_available:platform", + "com.android.bluetooth", "com.android.compos", "com.android.uwb", "com.android.virt", diff --git a/cargo2android.json b/cargo2android.json index 9a21b76..7869832 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,13 +1,14 @@ { "apex-available": [ "//apex_available:platform", + "com.android.bluetooth", "com.android.compos", "com.android.uwb", "com.android.virt" ], "dependencies": true, "device": true, - "min_sdk_version": "29", + "min-sdk-version": "29", "run": true, "tests": true -} \ No newline at end of file +} -- cgit v1.2.3 From 28198eaec1c244f8b49ebb2adf2c20f67cc021fa Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Thu, 13 Jan 2022 21:49:35 +0000 Subject: Make vendor available Bug: 216358770 Change-Id: I676f125f53fb6ca2b59fbc6cca230330faa3945f --- Android.bp | 1 + cargo2android.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index b935c29..e712fd7 100644 --- a/Android.bp +++ b/Android.bp @@ -60,6 +60,7 @@ rust_library { "com.android.uwb", "com.android.virt", ], + vendor_available: true, min_sdk_version: "29", } diff --git a/cargo2android.json b/cargo2android.json index 7869832..f7c1ca1 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -10,5 +10,6 @@ "device": true, "min-sdk-version": "29", "run": true, - "tests": true + "tests": true, + "vendor-available": true } -- cgit v1.2.3 From a7ecc5256cbcdffc97285ec4d0443b24b96e357c Mon Sep 17 00:00:00 2001 From: David LeGare Date: Wed, 2 Mar 2022 19:54:25 +0000 Subject: Update TEST_MAPPING Test: cd external/rust/crates && atest --host -c Change-Id: I68d4f768f6eda30bf35aa48b5448e65eb8b91d8d --- TEST_MAPPING | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TEST_MAPPING b/TEST_MAPPING index 3250256..cb7008a 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -36,6 +36,9 @@ { "name": "libapkverify.test" }, + { + "name": "libcert_request_validator_tests" + }, { "name": "libidsig.test" }, @@ -62,6 +65,9 @@ { "name": "libapkverify.test" }, + { + "name": "libcert_request_validator_tests" + }, { "name": "libidsig.test" }, -- cgit v1.2.3