diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-17 12:26:47 +0000 |
---|---|---|
committer | Andrew Walbran <qwandor@google.com> | 2023-11-17 12:27:34 +0000 |
commit | dcfeb4c7ccf74d5cababea855b578f6ec7ea60da (patch) | |
tree | da05e7b4a48c73f8d80aa4eb562ab11648c5ff73 | |
parent | 19da758b30303e819c8a5f42563949d669596cd9 (diff) | |
download | webpki-dcfeb4c7ccf74d5cababea855b578f6ec7ea60da.tar.gz |
Migrate to cargo_embargo.
Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I250939065d043f7e7c0d79768e13c96c7b98690c
-rw-r--r-- | Android.bp | 40 | ||||
-rw-r--r-- | cargo2android.json | 8 | ||||
-rw-r--r-- | cargo_embargo.json | 10 |
3 files changed, 35 insertions, 23 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -77,13 +77,18 @@ rust_test { ], } -rust_defaults { - name: "webpki_test_defaults", - crate_name: "webpki", +rust_test { + name: "webpki_test_tests_dns_name_tests", + host_supported: true, + crate_name: "dns_name_tests", cargo_env_compat: true, cargo_pkg_version: "0.22.0", + srcs: ["tests/dns_name_tests.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "alloc", @@ -98,21 +103,26 @@ rust_defaults { } rust_test { - name: "webpki_test_tests_dns_name_tests", - defaults: ["webpki_test_defaults"], - host_supported: true, - srcs: ["tests/dns_name_tests.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "webpki_test_tests_integration", - defaults: ["webpki_test_defaults"], host_supported: true, + crate_name: "integration", + cargo_env_compat: true, + cargo_pkg_version: "0.22.0", srcs: ["tests/integration.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "alloc", + "std", + ], + rustlibs: [ + "libbase64_rust", + "libring", + "libuntrusted", + "libwebpki", + ], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index e0aa06c..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "device": true, - "features": "alloc,std", - "run": true, - "tests": true, - "vendor-available": false, - "product-available": false -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..e0003f2 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,10 @@ +{ + "features": [ + "alloc", + "std" + ], + "product_available": false, + "run_cargo": false, + "tests": true, + "vendor_available": false +} |