summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 02:03:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 02:03:56 +0000
commit8d97986422e7734260a61ef482c0713e6a58799a (patch)
tree9777f8b55bf81a9ab896767ed7036b1fe5be6f41
parente3f213173fabd70322ceecf60e409fb0ccfcbc77 (diff)
parentb8374cfeae905a4fa97421a3cfa4957b3495c9de (diff)
downloadidna-8d97986422e7734260a61ef482c0713e6a58799a.tar.gz
Migrate to cargo_embargo. am: b8374cfeae
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/idna/+/2822155 Change-Id: I10ff5dd49adfaff2cfcd800bc68e4a43839b49f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json10
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index c80099f..4ffc58f 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 f9f13d4..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.resolv"
- ],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": 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
+}