aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 13:14:00 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-20 13:14:00 +0000
commitf13a18b8e756ca94ffe8887d4358b34a7c9e4ff4 (patch)
treee7b24cf178e002af314245a148fad13194dfc8ac
parent43a62263d094c01d5c098508e5890b1607cb67e3 (diff)
downloadlibloading-f13a18b8e756ca94ffe8887d4358b34a7c9e4ff4.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I1364a78f9a269c33466a323590258dd487a95fd9
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json7
3 files changed, 9 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 4c7c2ac..f847d8a 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: "0.7.4",
srcs: ["src/lib.rs"],
edition: "2015",
- rustlibs: [
- "libcfg_if",
- ],
+ rustlibs: ["libcfg_if"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 42b7833..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..fbb9fcd
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "run_cargo": false
+}