Merge "Revert^2 "Make things match what's in the crate archive."" into main
diff --git a/Android.bp b/Android.bp
index 901f8bd..757749d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,7 @@
package {
default_applicable_licenses: ["external_rust_crates_thiserror-impl_license"],
+ default_team: "trendy_team_android_rust",
}
license {
diff --git a/cargo_embargo.json b/cargo_embargo.json
index cb908d7..1dc3922 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -1,3 +1,4 @@
{
- "run_cargo": false
+ "run_cargo": false,
+ "generate_rulesmk": true
}
diff --git a/rules.mk b/rules.mk
index 4b1db2c..8299639 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,17 +1,17 @@
-# This file is generated by cargo2rulesmk.py --run.
-# Do not modify this file as changes will be overridden on upgrade.
+# This file is generated by cargo_embargo.
+# Do not modify this file after the LOCAL_DIR line
+# because the changes will be overridden on upgrade.
+# Content before the first line starting with LOCAL_DIR is preserved.
LOCAL_DIR := $(GET_LOCAL_DIR)
MODULE := $(LOCAL_DIR)
MODULE_CRATE_NAME := thiserror_impl
MODULE_RUST_CRATE_TYPES := proc-macro
-MODULE_SRCS := \
- $(LOCAL_DIR)/src/lib.rs \
-
-MODULE_RUST_EDITION := 2018
+MODULE_SRCS := $(LOCAL_DIR)/src/lib.rs
+MODULE_RUST_EDITION := 2021
MODULE_LIBRARY_DEPS := \
- external/rust/crates/proc-macro2 \
- external/rust/crates/quote \
- external/rust/crates/syn \
+ $(call FIND_CRATE,proc-macro2) \
+ $(call FIND_CRATE,quote) \
+ $(call FIND_CRATE,syn)
include make/library.mk
