aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:17:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:17:23 +0000
commitaaf7267d9080eed6ddd84a56e2f5be08f978494d (patch)
tree2c2699894ee89f1d3c0fbbbf458320e39a2d7dc6
parentec72b81c43ce13746babd2713aa1d78f9e43b1ed (diff)
parentf98a04f1cb7e8b4d1f8fb95214feb2e2327dc913 (diff)
downloadaarch64-paging-aaf7267d9080eed6ddd84a56e2f5be08f978494d.tar.gz
Migrate to cargo_embargo. am: fdbe7c8a60 am: f98a04f1cb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aarch64-paging/+/2796177 Change-Id: I2941706fdf605104b344b5627494d781e7f3c39f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json13
3 files changed, 16 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp
index cf6d40e..59675b5 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 {
@@ -57,9 +57,7 @@ rust_test {
"alloc",
"default",
],
- rustlibs: [
- "libbitflags",
- ],
+ rustlibs: ["libbitflags"],
enabled: false,
arch: {
arm64: {
@@ -80,9 +78,7 @@ rust_library {
"alloc",
"default",
],
- rustlibs: [
- "libbitflags",
- ],
+ rustlibs: ["libbitflags"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 7cf9e83..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "add-module-block": "cargo2android_module.bp",
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e9f4935
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+ "tests": true,
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "package": {
+ "aarch64-paging": {
+ "add_module_block": "cargo2android_module.bp"
+ }
+ },
+ "run_cargo": false
+}