aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 13:20:16 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-20 13:20:16 +0000
commit8725301739be8b074dfb9f94375b351ea18dac2c (patch)
tree4cdb9480305c1f26508a75c711cabff8efedffd8
parentfcb62b15e51bd738fbb049bc6a5f6b542746e2e5 (diff)
downloadshared_child-8725301739be8b074dfb9f94375b351ea18dac2c.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I43be5697f734b56cfd7ff7f1252a502be2ea7e3e
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json8
3 files changed, 10 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index dddc7ae..81ae991 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 {
@@ -26,9 +26,7 @@ rust_library {
cargo_pkg_version: "1.0.0",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "liblibc",
- ],
+ rustlibs: ["liblibc"],
apex_available: [
"//apex_available:platform",
"com.android.compos",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4f8003c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.compos",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "run": true,
- "tests": false
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..dd2bfad
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.compos",
+ "com.android.virt"
+ ],
+ "run_cargo": false
+}