aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 02:42:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 02:42:44 +0000
commit539be0ce88e2b8ff92bbd8e8133e74e9ad825696 (patch)
tree31bfbde306507249ed3a8e8e1dbbbf6b383c3152
parent74954b40aec2ef8c70ce76f92c38c6bafa7da2f0 (diff)
parent60adb2ea6c74399fadb13c19d14598a8b085abe4 (diff)
downloadpdl-runtime-539be0ce88e2b8ff92bbd8e8133e74e9ad825696.tar.gz
Migrate to cargo_embargo. am: 590d9e906d am: e1405e9915 am: 60adb2ea6c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pdl-runtime/+/2828319 Change-Id: I9d6e0e9eb46e7444ec0526a831008d59444671c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json6
-rw-r--r--cargo_embargo.json4
3 files changed, 5 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 2a3bab3..d558bb4 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 {
name: "libpdl_runtime",
host_supported: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index fcf6c7d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "device": true,
- "min-sdk-version": "33",
- "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..6549d09
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "min_sdk_version": "33",
+ "run_cargo": false
+}