commit f8bf439bbe33950d2e4c666d8fe79fdab99024ed
author Andrew Walbran <qwandor@google.com> Mon Nov 20 15:26:23 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 20 15:26:23 2023 +0000
tree e7b24cf178e002af314245a148fad13194dfc8ac
parent ae9ec6a74fb08624d9d75e6deb75ffced4147812
parent f13a18b8e756ca94ffe8887d4358b34a7c9e4ff4

Migrate to cargo_embargo. am: f13a18b8e7

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libloading/+/2838079

Change-Id: I90649f1bb0c0f47d0c1c568e6ff6ee3a1d375e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

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 @@
     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",

cargo2android.json

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

cargo_embargo.json

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
+}