commit 336afeb2a6772fb45419ce438990f4822b2471a9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 21 03:15:20 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 21 03:15:20 2023 +0000
tree 157d7350568b6a3d19651dae6a01eff85c78c226
parent 14064b1f0abd0a2f0ca84e310d82287f11878746
parent 870b5e7be623c0b15d3448110efffeef3d2cf109

Snap for 10985023 from 870b5e7be623c0b15d3448110efffeef3d2cf109 to 24Q1-release

Change-Id: I370e2de1732b1870182588229af446efb2d1f964

Android.bp

diff --git a/Android.bp b/Android.bp
index b7c4361..6bc9c25 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 {
@@ -41,7 +41,6 @@
 
 rust_library {
     name: "libintrusive_collections",
-    // has rustc warnings
     host_supported: true,
     crate_name: "intrusive_collections",
     cargo_env_compat: true,
@@ -52,9 +51,7 @@
         "alloc",
         "default",
     ],
-    rustlibs: [
-        "libmemoffset",
-    ],
+    rustlibs: ["libmemoffset"],
     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
+}