aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 15:57:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-20 15:57:39 +0000
commit7da60cb1670c4f9bbb9564ed69d1606f6d6bc06e (patch)
treee7b24cf178e002af314245a148fad13194dfc8ac
parent5b2c645c3a3e050b9b431ed596af51fd14c0d01c (diff)
parent7fd07ea45fe86513943ae55e028a4d2f223238a8 (diff)
downloadlibloading-7da60cb1670c4f9bbb9564ed69d1606f6d6bc06e.tar.gz
Migrate to cargo_embargo. am: f13a18b8e7 am: 7fd07ea45f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libloading/+/2838079 Change-Id: I0444a9b923bc4e0e2334bb5dbf84e059058faa10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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
+}