diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:08 +0000 |
commit | 88a5c05d7e09786db8a96dc28e420f13e53edebc (patch) | |
tree | 18c480b6ffbe74ccb83f29e339656c91117a4973 | |
parent | 05a578e5742c626db7040152abc021ae786000f2 (diff) | |
parent | cded7e2bcec99fc080ccd44a7fe4a125f3641104 (diff) | |
download | base64-88a5c05d7e09786db8a96dc28e420f13e53edebc.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: cded7e2bce
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/base64/+/1912045
Change-Id: I3fefebae0564a17e84c5569a73d11114f3103b51
-rw-r--r-- | Android.bp | 45 | ||||
-rw-r--r-- | TEST_MAPPING | 29 | ||||
-rw-r--r-- | cargo2android.json | 26 |
3 files changed, 45 insertions, 55 deletions
@@ -1,8 +1,6 @@ // This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. - - package { default_applicable_licenses: ["external_rust_crates_base64_license"], } @@ -40,8 +38,10 @@ license { } rust_defaults { - name: "base64_defaults", + name: "base64_test_defaults", crate_name: "base64", + cargo_env_compat: true, + cargo_pkg_version: "0.13.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -57,56 +57,33 @@ rust_defaults { ], } -rust_test_host { - name: "base64_host_test_tests_decode", - defaults: ["base64_defaults"], - srcs: ["tests/decode.rs"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "base64_device_test_tests_decode", - defaults: ["base64_defaults"], + name: "base64_test_tests_decode", + defaults: ["base64_test_defaults"], + host_supported: true, srcs: ["tests/decode.rs"], -} - -rust_test_host { - name: "base64_host_test_tests_encode", - defaults: ["base64_defaults"], - srcs: ["tests/encode.rs"], test_options: { unit_test: true, }, } rust_test { - name: "base64_device_test_tests_encode", - defaults: ["base64_defaults"], + name: "base64_test_tests_encode", + defaults: ["base64_test_defaults"], + host_supported: true, srcs: ["tests/encode.rs"], -} - -rust_test_host { - name: "base64_host_test_tests_helpers", - defaults: ["base64_defaults"], - srcs: ["tests/helpers.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "base64_device_test_tests_helpers", - defaults: ["base64_defaults"], - srcs: ["tests/helpers.rs"], -} - rust_library { name: "libbase64_rust", stem: "libbase64", host_supported: true, crate_name: "base64", + cargo_env_compat: true, + cargo_pkg_version: "0.13.0", srcs: ["src/lib.rs"], edition: "2018", features: [ diff --git a/TEST_MAPPING b/TEST_MAPPING index 5b7b1a1..de2964d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,14 +1,16 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "base64_device_test_tests_decode" - }, + "path": "external/rust/crates/webpki" + } + ], + "presubmit": [ { - "name": "base64_device_test_tests_encode" + "name": "base64_test_tests_decode" }, { - "name": "base64_device_test_tests_helpers" + "name": "base64_test_tests_encode" }, { "name": "doh_unit_test" @@ -21,15 +23,26 @@ }, { "name": "microdroid_manager_test" + } + ], + "presubmit-rust": [ + { + "name": "base64_test_tests_decode" + }, + { + "name": "base64_test_tests_encode" }, { - "name": "webpki_device_test_src_lib" + "name": "doh_unit_test" }, { - "name": "webpki_device_test_tests_dns_name_tests" + "name": "libapkverify.integration_test" }, { - "name": "webpki_device_test_tests_integration" + "name": "libapkverify.test" + }, + { + "name": "microdroid_manager_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index 6c4525a..d2d1ca1 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,14 +1,14 @@ { - "apex-available": [ - "//apex_available:platform", - "com.android.resolv" - ], - "min_sdk_version": "29", - "device": true, - "run": true, - "test-blocklist": [ - "src/lib.rs", - "tests/tests.rs" - ], - "tests": true - }
\ No newline at end of file + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "device": true, + "min-sdk-version": "29", + "run": true, + "test-blocklist": [ + "src/lib.rs", + "tests/tests.rs" + ], + "tests": true +}
\ No newline at end of file |