commit 3e452ef093975f3f3d5d4ebfe81d04e25e5eb503
author Andrew Walbran <qwandor@google.com> Fri Nov 17 11:56:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 17 11:56:48 2023 +0000
tree c6f0d116139229c8724c44734153a51a7837bcd5
parent 36933a877b67926f7696e71c8cc88c2141e585a0
parent 6782b6c6599dc4456aeb1f33a53675202f9abaf6

Migrate to cargo_embargo. am: 3530b1801c am: 6782b6c659

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror/+/2834455

Change-Id: Ia28b839bc40f5f758949f5bfbc42e0bca0e64990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

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 {

cargo2android.json

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
-}

cargo_embargo.json

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
+}