summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-17 17:56:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 17:56:48 +0000
commitdf729b0cc99d99119219e45d54465356a795e8bb (patch)
tree235ad0287d7a4f574fa02a70d1a0d2c072fd9605
parent56e868a00028065a41d3331134397b083daa8591 (diff)
parent0f14ba629d9ea81e820720f1a9cab861add29a02 (diff)
downloadtinyvec_macros-df729b0cc99d99119219e45d54465356a795e8bb.tar.gz
Migrate to cargo_embargo. am: 0f14ba629d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec_macros/+/2832893 Change-Id: I9ed102823441b1e30ba95b5fd20198ad788495f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index 8d96aaf..45b494e 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 911c36f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.resolv"
- ],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9617c46
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.resolv"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false
+}