aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-12-16 00:04:23 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-12-16 00:04:23 +0000
commit744754aebf0ddc7279c9c0be65625cdaf703f39b (patch)
tree4c7c7f58fc7141686b0c8665aea7c9129ed9fab7
parent9ad36ee7f0bf3bea9bb229f908ad8a9d92b9a6d0 (diff)
parent68656c9e024d4376e307907f08f65a3a38236fe8 (diff)
downloadsame-file-744754aebf0ddc7279c9c0be65625cdaf703f39b.tar.gz
Snap for 8005954 from 68656c9e024d4376e307907f08f65a3a38236fe8 to sdk-releaseplatform-tools-33.0.1platform-tools-33.0.0platform-tools-32.0.0
Change-Id: Ia4d24bc18099630631832f833e620bdad0c81d34
-rw-r--r--Android.bp4
-rw-r--r--TEST_MAPPING12
-rw-r--r--cargo2android.json4
3 files changed, 13 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index e3e1f05..6513a97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 {
@@ -42,6 +42,8 @@ rust_library {
name: "libsame_file",
host_supported: true,
crate_name: "same_file",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.0.6",
srcs: ["src/lib.rs"],
edition: "2018",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 05c6d70..87ecd5c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,20 @@
// 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/bitflags"
},
{
- "name": "base64_device_test_tests_helpers"
+ "path": "external/rust/crates/tinytemplate"
},
{
- "name": "unicode-xid_device_test_src_lib"
+ "path": "external/rust/crates/tinyvec"
},
{
- "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