From 8a7518d7925134dbe3e43618dc89916dec912127 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Thu, 16 Nov 2023 16:12:21 +0000
Subject: Re-run cargo2android.py.

Test: Presubmit
Change-Id: I61fd8a9f07afc8a733070dbd82733f4f22b1dc3c
---
 Android.bp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index 7075380..adc6cc2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,10 +42,9 @@ rust_library {
     host_supported: true,
     crate_name: "thiserror",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.40",
+    cargo_pkg_version: "1.0.49",
     srcs: ["src/lib.rs"],
-    edition: "2018",
-    cfgs: ["provide_any"],
+    edition: "2021",
     proc_macros: ["libthiserror_impl"],
     apex_available: [
         "//apex_available:anyapex",
-- 
cgit v1.2.3


From 3530b1801ca627c25c8bb6e62025a82653946def Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Thu, 16 Nov 2023 16:12:45 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: Ib7481ecfde208489f35ed4c0f9fdeba54116ee67
---
 Android.bp         |  2 +-
 cargo2android.json | 12 ------------
 cargo_embargo.json |  8 ++++++++
 3 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index adc6cc2..ef9c6f7 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index aba94bd..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:anyapex",
-    "//apex_available:platform"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "vendor-available": true,
-  "product-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..3e8023e
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:anyapex",
+    "//apex_available:platform"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false
+}
-- 
cgit v1.2.3