summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 09:56:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 09:56:06 +0000
commit18aed4c2c0a1ee1da21097b8eb7e8eeb64cdf38a (patch)
treedb3d1f3d3428d3a6c8be833de3caf8c1fd2bb668
parentf4ed47cb372a9904933d83762f569999a7f26063 (diff)
parent84cc97d23b5f5b3f760344cf7d2653aa91660ab2 (diff)
downloadpercent-encoding-18aed4c2c0a1ee1da21097b8eb7e8eeb64cdf38a.tar.gz
Migrate to cargo_embargo. am: db112fb0d2 am: e005aad62f am: 84cc97d23b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/percent-encoding/+/2829798 Change-Id: I487999b60ae9e8fdce85a9a719b9b96c7a2e7248 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 6183c54..755450b 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
+}