diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:21 +0000 |
commit | 0deb2fafe4c43c9c31033f210df6294b41c61c16 (patch) | |
tree | cd3afe67de07a24c737a5872b5c5761f9745e330 | |
parent | 959fbc7bdbd23ad7422175cfd5de1d59f5632498 (diff) | |
parent | 27fe648bffdf1903d23ccd00bd70e9756d86ece3 (diff) | |
download | plotters-svg-0deb2fafe4c43c9c31033f210df6294b41c61c16.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 27fe648bff
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/plotters-svg/+/1912507
Change-Id: I57094376b241386df0444aeae818a40178d6d1f8
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 12 insertions, 12 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,12 +22,11 @@ rust_library { name: "libplotters_svg", host_supported: true, crate_name: "plotters_svg", + cargo_env_compat: true, + cargo_pkg_version: "0.3.1", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ "libplotters_backend", ], } - -// dependent_library ["feature_list"] -// plotters-backend-0.3.2 diff --git a/TEST_MAPPING b/TEST_MAPPING index 05c6d70..3cbd48d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,17 @@ // 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/base64" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "unicode-xid_device_test_src_lib" - }, - { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "path": "external/rust/crates/unicode-xid" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +}
\ No newline at end of file |