aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-20 11:59:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-20 11:59:52 +0000
commit4e52c4838cabe368dc248d07cba39b07edc62734 (patch)
tree157d7350568b6a3d19651dae6a01eff85c78c226
parentd05ec8b1b79efe08e376214ce1c6451a1fd40503 (diff)
parentee1fe42507273ba12d4c56f6f456879e628548f2 (diff)
downloadintrusive-collections-4e52c4838cabe368dc248d07cba39b07edc62734.tar.gz
Migrate to cargo_embargo. am: ee1fe42507
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/intrusive-collections/+/2796218 Change-Id: Ibe91f129678acbd4ed1ea27dd970322c654353f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp7
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json7
3 files changed, 9 insertions, 14 deletions
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 @@ license {
rust_library {
name: "libintrusive_collections",
- // has rustc warnings
host_supported: true,
crate_name: "intrusive_collections",
cargo_env_compat: true,
@@ -52,9 +51,7 @@ rust_library {
"alloc",
"default",
],
- rustlibs: [
- "libmemoffset",
- ],
+ rustlibs: ["libmemoffset"],
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
+}