aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 17:27:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 17:27:54 +0000
commitf7612d705c8458c967208c71c4ada15e0989daba (patch)
tree5382dbe1fa4c981852d60b8df2964ba344d436ba
parent7e833aad4c4a5a4421ca87ea95e40bfe50223810 (diff)
parent9398cff3a3fee271653998ef3a9d4a9e25a37ef1 (diff)
downloadmacaddr-f7612d705c8458c967208c71c4ada15e0989daba.tar.gz
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: eb7f6ecc7a am: 1c6862cf90 am: 9398cff3a3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/macaddr/+/1912680 Change-Id: I5116e697431150bfb7ded0f2525467fbc8258398
-rw-r--r--Android.bp12
-rw-r--r--cargo2android.json5
2 files changed, 8 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 7430a0f..d7d879b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=serde,std.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -41,6 +41,8 @@ rust_library {
name: "libmacaddr",
host_supported: true,
crate_name: "macaddr",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.0.1",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -51,11 +53,3 @@ rust_library {
"libserde",
],
}
-
-// dependent_library ["feature_list"]
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.9 "default,proc-macro"
-// serde-1.0.124 "derive,serde_derive"
-// serde_derive-1.0.124 "default"
-// syn-1.0.64 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// unicode-xid-0.2.1 "default"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..456ff71
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "device": true,
+ "features": "serde,std",
+ "run": true
+} \ No newline at end of file