aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 15:26:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-20 15:26:32 +0000
commitc659a3cc4711746b2b887113005b9ffc207d03c9 (patch)
tree2526d664052f7043a5978d3bd255de6ec592188a
parentbe6493bd36d9c9092c91073345d7947dabbbd1b8 (diff)
parentda8ef9fbda3e079c4e68d2670a02d74963bdee2e (diff)
downloadsocket2-c659a3cc4711746b2b887113005b9ffc207d03c9.tar.gz
Migrate to cargo_embargo. am: da8ef9fbdaemu-34-3-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/socket2/+/2837796 Change-Id: I525119e6525f788c3ea6b28d4ee12c3eeed5091b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json7
-rw-r--r--cargo_embargo.json7
3 files changed, 9 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index 4245132..5c83f60 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 {
@@ -46,9 +46,7 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2021",
features: ["all"],
- rustlibs: [
- "liblibc",
- ],
+ rustlibs: ["liblibc"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6cf7f3d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "device": true,
- "features": "all",
- "min-sdk-version": "29",
- "vendor-available": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..bc82b96
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+ "features": [
+ "all"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false
+}