Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged
Bug: 166295507
Merged-In: I72a48b539b851a297dae70f394b3236deac9b865
Change-Id: I75d3412a3df37dd90989bdde1411660673baa3d2
diff --git a/Android.bp b/Android.bp
index 5faa928..30e65f1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,30 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
+
+rust_defaults {
+ name: "bitflags_defaults",
+ crate_name: "bitflags",
+ // has rustc warnings
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ features: [
+ "default",
+ ],
+ flags: [
+ "--cfg bitflags_const_fn",
+ ],
+}
+
+rust_test_host {
+ name: "bitflags_host_test_src_lib",
+ defaults: ["bitflags_defaults"],
+}
+
+rust_test {
+ name: "bitflags_device_test_src_lib",
+ defaults: ["bitflags_defaults"],
+}
rust_library {
name: "libbitflags",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..d4d74c8
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+ "presubmit": [
+ {
+ "name": "bitflags_host_test_src_lib",
+ "host": true
+ },
+ {
+ "name": "bitflags_device_test_src_lib"
+ }
+ ]
+}
