summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 04:36:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 04:36:45 +0000
commitfd3605d5fd9cc650a572a4f3b9f5f059ad3bfc63 (patch)
tree9777f8b55bf81a9ab896767ed7036b1fe5be6f41
parentd3f4dff74943ae1ad5bc8dd26196cbfdf3088945 (diff)
parent2a3de09c126563790ad4d4640fcdfdd47282267d (diff)
downloadidna-fd3605d5fd9cc650a572a4f3b9f5f059ad3bfc63.tar.gz
Migrate to cargo_embargo. am: b8374cfeae am: e3ca407806 am: 2a3de09c12
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/idna/+/2822155 Change-Id: I5d0b85970980e813df3b83829f67b7f035377dc0 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
+}