Snap for 8347268 from 116665b48e087b8daecafadee8fe77313486d9b1 to mainline-go-conscrypt-release
Change-Id: I1d7e6efb97aa877e8971ee6e4742b5325c5f0401
diff --git a/Android.bp b/Android.bp
index 8e6090a..363deca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --run --dependencies --host-first-multilib.
package {
default_applicable_licenses: [
@@ -41,10 +40,7 @@
rust_library_host {
name: "libproc_macro_error",
- // has rustc warnings
crate_name: "proc_macro_error",
- cargo_env_compat: true,
- cargo_pkg_version: "1.0.4",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -52,12 +48,24 @@
"syn",
"syn-error",
],
- cfgs: ["use_fallback"],
+ flags: [
+ "--cfg skip_ui_tests",
+ ],
rustlibs: [
"libproc_macro2",
"libquote",
"libsyn",
],
- proc_macros: ["libproc_macro_error_attr"],
+ proc_macros: [
+ "libproc_macro_error_attr",
+ ],
compile_multilib: "first",
}
+
+// dependent_library ["feature_list"]
+// proc-macro-error-attr-1.0.4
+// proc-macro2-1.0.23 "default,proc-macro"
+// quote-1.0.7 "default,proc-macro"
+// syn-1.0.42 "clone-impls,default,derive,parsing,printing,proc-macro,quote,visit"
+// unicode-xid-0.2.1 "default"
+// version_check-0.9.2
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 8029a19..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
- "imports": [
- {
- "path": "external/rust/crates/base64"
- }
- ],
- "presubmit": [
- {
- "name": "authfs_device_test_src_lib"
- }
- ],
- "presubmit-rust": [
- {
- "name": "authfs_device_test_src_lib"
- }
- ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bb77633..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "host-first-multilib": true,
- "run": true
-}
\ No newline at end of file
