diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 1d083d1c3152a9151fa5e4dff8470fb294ecdb3d (patch) | |
tree | 451761d38432b665e00321389ba05ec331f635ed | |
parent | d49ed59b5f59e14822fd9c5a9771379dbf51e14a (diff) | |
parent | ea1df69fa76ae340af6fd91a45f6b6ec03f69743 (diff) | |
download | plotters-1d083d1c3152a9151fa5e4dff8470fb294ecdb3d.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 11 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 13 insertions, 16 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --features=svg_backend,area_series,line_series. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,6 +22,8 @@ rust_library { name: "libplotters", host_supported: true, crate_name: "plotters", + cargo_env_compat: true, + cargo_pkg_version: "0.3.1", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -36,10 +38,3 @@ rust_library { "libplotters_svg", ], } - -// dependent_library ["feature_list"] -// autocfg-1.0.1 -// libm-0.2.1 "default" -// num-traits-0.2.14 "default,i128,libm,std" -// plotters-backend-0.3.0 -// plotters-svg-0.3.0 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..5866f21 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "features": "svg_backend,area_series,line_series", + "run": true +}
\ No newline at end of file |