summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 16:13:20 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-16 16:13:20 +0000
commitca1db9f032317edec560e1f29076cab3c6cfd65c (patch)
treeee2602d0f5ce009d2aca75e0502683dbd4a82293
parent9c2299da7571846c6e139e16f17406f788bd1071 (diff)
downloadthiserror-impl-ca1db9f032317edec560e1f29076cab3c6cfd65c.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I0c56b48db27a087e4713b242e1815ee2f00b79c7
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json3
3 files changed, 6 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index b62d6fa..5ac3381 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -43,9 +43,9 @@ rust_proc_macro {
name: "libthiserror_impl",
crate_name: "thiserror_impl",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.40",
+ cargo_pkg_version: "1.0.49",
srcs: ["src/lib.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"libproc_macro2",
"libquote",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "device": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}