aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 18:06:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 18:06:43 +0000
commitefe0ecca2f77a7cf61f580a6c32945b99a081784 (patch)
tree46b87e7dd43361b48f69418dbb67239af8f2ee72
parentdb04c47c3f6577a984aa7a9ca5e91114348e118b (diff)
parentaea803041c69b7475b381f7e56ee8afadeeec1d2 (diff)
downloadderive_arbitrary-efe0ecca2f77a7cf61f580a6c32945b99a081784.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c8d1fe0877 am: ad4ba91b0b am: 29f7421b0e am: aea803041c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/derive_arbitrary/+/1912600 Change-Id: Ibeb71242cb33854a747c577165ec570a13a24f9a
-rw-r--r--Android.bp2
-rw-r--r--TEST_MAPPING8
-rw-r--r--cargo2android.json4
3 files changed, 13 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 80237a0..6ff242f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..d6cefe5
--- /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/arbitrary"
+ }
+ ]
+}
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