aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 13:20:44 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-20 13:20:44 +0000
commitda8ef9fbda3e079c4e68d2670a02d74963bdee2e (patch)
tree2526d664052f7043a5978d3bd255de6ec592188a
parent2fba488c1dd4b7e2a1aaf16d0148996bb4571709 (diff)
downloadsocket2-da8ef9fbda3e079c4e68d2670a02d74963bdee2e.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I775a64fdc4266b924c4d421da5ee4c63d0d0aa80
-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
+}