Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 0ce190f..f56a6fd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --host-first-multilib.
+// 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_no-panic_license"],
@@ -39,6 +40,8 @@
rust_proc_macro {
name: "libno_panic",
crate_name: "no_panic",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.15",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -48,9 +51,3 @@
],
compile_multilib: "first",
}
-
-// dependent_library ["feature_list"]
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.8 "default,proc-macro"
-// syn-1.0.60 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
-// unicode-xid-0.2.1 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0584ced..d863df5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,8 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "presubmit": [
+ "imports": [
{
- "name": "libm_device_test_src_lib"
+ "path": "external/rust/crates/libm"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bb77633
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+ "host-first-multilib": true,
+ "run": true
+}
\ No newline at end of file
