aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 18:06:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 18:06:45 +0000
commitd7efbd482ba01da2a8738eda463ec30465b2e7bc (patch)
treedd8b603eb648bafa8875ea9e5daacd10154a58bb
parent27926c543400a488dbcfa9b49aeb357f3c72887a (diff)
parent70a1db204c54b0554398807f50dee3ba9d968d5c (diff)
downloadrustversion-d7efbd482ba01da2a8738eda463ec30465b2e7bc.tar.gz
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: 745447da07 am: 758143db2f am: 5aab721354 am: 70a1db204c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustversion/+/1912812 Change-Id: Ia8e6fd256c287ddc68c04fc09dab2fa712e3d904
-rw-r--r--Android.bp4
-rw-r--r--TEST_MAPPING8
-rw-r--r--cargo2android.json4
3 files changed, 15 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index dfe1604..ad91d42 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 {
@@ -40,6 +40,8 @@ license {
rust_proc_macro {
name: "librustversion",
crate_name: "rustversion",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.0.5",
srcs: ["src/lib.rs"],
edition: "2018",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..a13141c
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+ "imports": [
+ {
+ "path": "external/rust/crates/bitflags"
+ }
+ ]
+}
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