aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 04:32:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 04:32:03 +0000
commit1e59aae4b4a9b2ddffb99dc4722788562e18790d (patch)
tree77d115c8b1f0e01e5e061bd56a405b04efdf12d0
parent81db4274f7df7162b5eb95de3d5f1b4c0f20eecc (diff)
parente9b0384d9fdaa4b1bd55d744ff56a60022f1cdc7 (diff)
downloadsmccc-1e59aae4b4a9b2ddffb99dc4722788562e18790d.tar.gz
Migrate to cargo_embargo. am: e24e2e4e2e am: bf01d4b1fe am: e9b0384d9f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smccc/+/2828012 Change-Id: I4b385d6a8d2c4d3879bc8ac8fa13964f235c083d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json11
3 files changed, 12 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index 3ac933a..e94e37c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
-
-
rust_library_rlib {
name: "libsmccc",
crate_name: "smccc",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c78127b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "force-rlib": true,
- "no-host": true,
- "no-std": true,
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e3c9cb8
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "package": {
+ "smccc": {
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ },
+ "run_cargo": false,
+ "tests": true
+}