aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 22:10:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 22:10:09 +0000
commit5150419994efee334c11c81cf53569f2beefc3e5 (patch)
tree75e5d94f0bf4521a46efd4cb178cf102d04c6da2
parentfe93c0d7f4ecfce3daa6876ae8d9a7c9d00107d6 (diff)
parentd09efb212ae258ec4c4afa007dbf721086161470 (diff)
downloadsemver-5150419994efee334c11c81cf53569f2beefc3e5.tar.gz
Migrate to cargo_embargo. am: 9d79354ae3 am: d09efb212a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/semver/+/2828130 Change-Id: I5a69f557b0b3405442286fef3a667b2e93441056 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.json17
3 files changed, 19 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index f148121..b5e9625 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 {
@@ -49,9 +49,7 @@ rust_library {
"serde",
"std",
],
- rustlibs: [
- "libserde",
- ],
+ rustlibs: ["libserde"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index f441aa9..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "no-host": true,
- "run": true,
- "features": "default,std,serde"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..a2ca437
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,17 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "features": [
+ "default",
+ "std",
+ "serde"
+ ],
+ "package": {
+ "semver": {
+ "host_supported": false
+ }
+ },
+ "run_cargo": false
+}