Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d3da86843f am: a328bdd699 am: e198a8e5b4 am: b91aab0674
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-derive/+/1912647
Change-Id: I3397371e0fe5d6883a00fe4b442ee1b7c8b7d152
diff --git a/Android.bp b/Android.bp
index 136e291..f962468 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_num-derive_license"],
@@ -39,6 +40,8 @@
rust_proc_macro {
name: "libnum_derive",
crate_name: "num_derive",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.3.3",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -47,9 +50,3 @@
"libsyn",
],
}
-
-// dependent_library ["feature_list"]
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.7 "default,proc-macro"
-// syn-1.0.48 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// unicode-xid-0.2.1 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 28ea51d..386cb5e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,6 +8,23 @@
"name": "libidsig.test"
},
{
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "libidsig.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
"name": "virtualizationservice_device_test"
}
]
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
