summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 16:21:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 16:21:55 +0000
commit7ef3ece2a8d11e9be1796a6f433ea6874e2f2e41 (patch)
treefc22501e5f3f5b729a27dc1ffd13c154e8d7e074
parent4b84eae604279b35d5e54a290dc0f97381c16ac1 (diff)
parent5aaa785ad4bb55e068d947682c5652bc44466966 (diff)
downloadform_urlencoded-7ef3ece2a8d11e9be1796a6f433ea6874e2f2e41.tar.gz
Migrate to cargo_embargo. am: 8b829742b4 am: 82d036ae80 am: 5aaa785ad4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/form_urlencoded/+/2822399 Change-Id: Ic10845d515af27550f385d7f089e5cbc5a280e65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json9
3 files changed, 11 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index 473d00e..3590b72 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 {
@@ -48,9 +48,7 @@ rust_library {
cargo_pkg_version: "1.1.0",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "libpercent_encoding",
- ],
+ rustlibs: ["libpercent_encoding"],
apex_available: [
"//apex_available:platform",
"com.android.resolv",
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..b8ed541
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.resolv"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false,
+ "tests": true
+}