Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged
Bug: 166295507
Merged-In: I5ad03c0357bdb217fe3fe24f786670e81962a756
Change-Id: Iff61b2672199137e5f25c22f727a74be4db8e413
diff --git a/Android.bp b/Android.bp
index d3fe994..9861ed1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device.
+// This file is generated by cargo2android.py --run --dependencies --device --tests.
rust_library {
name: "librustc_hash",
@@ -11,3 +11,26 @@
"std",
],
}
+
+rust_defaults {
+ name: "rustc-hash_defaults",
+ crate_name: "rustc_hash",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ features: [
+ "default",
+ "std",
+ ],
+}
+
+rust_test_host {
+ name: "rustc-hash_host_test_src_lib",
+ defaults: ["rustc-hash_defaults"],
+}
+
+rust_test {
+ name: "rustc-hash_device_test_src_lib",
+ defaults: ["rustc-hash_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..43dfe31
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+ "presubmit": [
+ {
+ "name": "rustc-hash_host_test_src_lib",
+ "host": true
+ },
+ {
+ "name": "rustc-hash_device_test_src_lib"
+ }
+ ]
+}