aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-17 11:24:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 11:24:59 +0000
commit6782b6c6599dc4456aeb1f33a53675202f9abaf6 (patch)
treec6f0d116139229c8724c44734153a51a7837bcd5
parentdf62be7c14326662dc4d8cf3bbc3169c39f6c164 (diff)
parent3530b1801ca627c25c8bb6e62025a82653946def (diff)
downloadthiserror-6782b6c6599dc4456aeb1f33a53675202f9abaf6.tar.gz
Migrate to cargo_embargo. am: 3530b1801cemu-34-3-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror/+/2834455 Change-Id: Ic6b6d6fb1d3fe379bc7b60c56b72d54e7dd347fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json12
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 13 deletions
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
+}