From d8d330938f4124bcb8a502b5a355e0ecac8a73f9 Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Tue, 22 Jun 2021 11:22:55 +0100 Subject: Allow CompOS APEX to access Ring. Bug: 191763370 Test: Client code (in progress) builds. Change-Id: I118a535363dbb8837342de19cfa9048eac2b9d62 --- Android.bp | 1 + cargo2android.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index cab84c6..81c4f48 100644 --- a/Android.bp +++ b/Android.bp @@ -27,6 +27,7 @@ rust_library { edition: "2018", apex_available: [ "//apex_available:platform", + "com.android.compos", "com.android.resolv", ], min_sdk_version: "29", diff --git a/cargo2android.json b/cargo2android.json index 911c36f..6d1f055 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,6 +1,7 @@ { "apex-available": [ "//apex_available:platform", + "com.android.compos", "com.android.resolv" ], "dependencies": true, @@ -8,4 +9,4 @@ "min-sdk-version": "29", "run": true, "tests": true -} \ No newline at end of file +} -- cgit v1.2.3 From d0de1ba30b66c3155f4b13cb11a82abb16525827 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 20 Aug 2021 23:51:44 +0900 Subject: Make the untrusted crate available to the virt APEX Bug: 193504400 Test: m Change-Id: I723c19514bdfda6cf92fe3ea57eb70e4b788a69b --- Android.bp | 1 + cargo2android.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 81c4f48..a152aa9 100644 --- a/Android.bp +++ b/Android.bp @@ -29,6 +29,7 @@ rust_library { "//apex_available:platform", "com.android.compos", "com.android.resolv", + "com.android.virt", ], min_sdk_version: "29", } diff --git a/cargo2android.json b/cargo2android.json index 6d1f055..646ac59 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -2,7 +2,8 @@ "apex-available": [ "//apex_available:platform", "com.android.compos", - "com.android.resolv" + "com.android.resolv", + "com.android.virt" ], "dependencies": true, "device": true, -- cgit v1.2.3 From a3890dbb3fcc3933ee2b9ffb148b08830fef048f Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 30 Aug 2021 10:56:05 -0700 Subject: Update TEST_MAPPING Test: None Change-Id: Ib5ba0ceb3c74905e433887f6790fcd6794af0b87 --- TEST_MAPPING | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 TEST_MAPPING diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 0000000..dd705a6 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,96 @@ +// Generated by update_crate_tests.py for tests that depend on this crate. +{ + "presubmit": [ + { + "name": "apkdmverity.test" + }, + { + "name": "doh_unit_test" + }, + { + "name": "libapkverify.integration_test" + }, + { + "name": "libapkverify.test" + }, + { + "name": "libidsig.test" + }, + { + "name": "microdroid_manager_test" + }, + { + "name": "quiche_device_test_src_lib" + }, + { + "name": "ring_device_test_src_lib", + "options": [ + { + "test-timeout": "100000" + } + ] + }, + { + "name": "ring_device_test_tests_aead_tests" + }, + { + "name": "ring_device_test_tests_agreement_tests" + }, + { + "name": "ring_device_test_tests_constant_time_tests" + }, + { + "name": "ring_device_test_tests_digest_tests", + "options": [ + { + "test-timeout": "600000" + } + ] + }, + { + "name": "ring_device_test_tests_ecdsa_tests" + }, + { + "name": "ring_device_test_tests_ed25519_tests" + }, + { + "name": "ring_device_test_tests_hkdf_tests" + }, + { + "name": "ring_device_test_tests_hmac_tests" + }, + { + "name": "ring_device_test_tests_pbkdf2_tests" + }, + { + "name": "ring_device_test_tests_quic_tests" + }, + { + "name": "ring_device_test_tests_rand_tests" + }, + { + "name": "ring_device_test_tests_rsa_tests" + }, + { + "name": "ring_device_test_tests_signature_tests" + }, + { + "name": "untrusted_device_test_src_untrusted" + }, + { + "name": "untrusted_device_test_tests_tests" + }, + { + "name": "virtualizationservice_device_test" + }, + { + "name": "webpki_device_test_src_lib" + }, + { + "name": "webpki_device_test_tests_dns_name_tests" + }, + { + "name": "webpki_device_test_tests_integration" + } + ] +} -- cgit v1.2.3 From 3d990a6ac152786c75c2a936d10048101071e99b Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:05:51 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: Ib0c6377aacc74e47b98490775fc781c56c398452 --- Android.bp | 49 ++++++++++------------------------- TEST_MAPPING | 76 +++++++++++++++++------------------------------------- cargo2android.json | 2 +- 3 files changed, 37 insertions(+), 90 deletions(-) diff --git a/Android.bp b/Android.bp index a152aa9..907d6e6 100644 --- a/Android.bp +++ b/Android.bp @@ -23,6 +23,8 @@ rust_library { // has rustc warnings host_supported: true, crate_name: "untrusted", + cargo_env_compat: true, + cargo_pkg_version: "0.7.1", srcs: ["src/untrusted.rs"], edition: "2018", apex_available: [ @@ -34,51 +36,26 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "untrusted_defaults", - crate_name: "untrusted", +rust_test { + name: "untrusted_test_tests_tests", // has rustc warnings - srcs: ["src/untrusted.rs"], + host_supported: true, + crate_name: "tests", + cargo_env_compat: true, + cargo_pkg_version: "0.7.1", + srcs: ["tests/tests.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", -} - -rust_test_host { - name: "untrusted_host_test_src_untrusted", - defaults: ["untrusted_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "untrusted_device_test_src_untrusted", - defaults: ["untrusted_defaults"], -} - -rust_defaults { - name: "untrusted_defaults_tests", - crate_name: "tests", - // has rustc warnings - srcs: ["tests/tests.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, edition: "2018", rustlibs: [ "libuntrusted", ], } -rust_test_host { - name: "untrusted_host_test_tests_tests", - defaults: ["untrusted_defaults_tests"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "untrusted_device_test_tests_tests", - defaults: ["untrusted_defaults_tests"], -} +// Errors when listing tests: +// error: lint `non_autolinks` has been renamed to `rustdoc::bare_urls` +// error: aborting due to previous error +// error: test failed, to rerun pass '--doc' diff --git a/TEST_MAPPING b/TEST_MAPPING index dd705a6..c1c46bd 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,5 +1,16 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/quiche" + }, + { + "path": "external/rust/crates/ring" + }, + { + "path": "external/rust/crates/webpki" + } + ], "presubmit": [ { "name": "apkdmverity.test" @@ -20,77 +31,36 @@ "name": "microdroid_manager_test" }, { - "name": "quiche_device_test_src_lib" - }, - { - "name": "ring_device_test_src_lib", - "options": [ - { - "test-timeout": "100000" - } - ] - }, - { - "name": "ring_device_test_tests_aead_tests" + "name": "untrusted_test_tests_tests" }, { - "name": "ring_device_test_tests_agreement_tests" - }, - { - "name": "ring_device_test_tests_constant_time_tests" - }, - { - "name": "ring_device_test_tests_digest_tests", - "options": [ - { - "test-timeout": "600000" - } - ] - }, - { - "name": "ring_device_test_tests_ecdsa_tests" - }, - { - "name": "ring_device_test_tests_ed25519_tests" - }, - { - "name": "ring_device_test_tests_hkdf_tests" - }, - { - "name": "ring_device_test_tests_hmac_tests" - }, + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "ring_device_test_tests_pbkdf2_tests" + "name": "apkdmverity.test" }, { - "name": "ring_device_test_tests_quic_tests" + "name": "doh_unit_test" }, { - "name": "ring_device_test_tests_rand_tests" + "name": "libapkverify.integration_test" }, { - "name": "ring_device_test_tests_rsa_tests" + "name": "libapkverify.test" }, { - "name": "ring_device_test_tests_signature_tests" + "name": "libidsig.test" }, { - "name": "untrusted_device_test_src_untrusted" + "name": "microdroid_manager_test" }, { - "name": "untrusted_device_test_tests_tests" + "name": "untrusted_test_tests_tests" }, { "name": "virtualizationservice_device_test" - }, - { - "name": "webpki_device_test_src_lib" - }, - { - "name": "webpki_device_test_tests_dns_name_tests" - }, - { - "name": "webpki_device_test_tests_integration" } ] } diff --git a/cargo2android.json b/cargo2android.json index 646ac59..506d866 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 4e8852f3d2a148183cbad3b8189c8ae42ba5d4ac Mon Sep 17 00:00:00 2001 From: David LeGare Date: Wed, 2 Mar 2022 19:54:27 +0000 Subject: Update TEST_MAPPING Test: cd external/rust/crates && atest --host -c Change-Id: I8d8e815cf546eb55011cf967cbd4c132068c262c --- TEST_MAPPING | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TEST_MAPPING b/TEST_MAPPING index c1c46bd..ca1b239 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -15,6 +15,9 @@ { "name": "apkdmverity.test" }, + { + "name": "authfs_device_test_src_lib" + }, { "name": "doh_unit_test" }, @@ -41,6 +44,9 @@ { "name": "apkdmverity.test" }, + { + "name": "authfs_device_test_src_lib" + }, { "name": "doh_unit_test" }, -- cgit v1.2.3