commit 062ba00fa5c7a7fe7ab76fa58160bec76ec91280
author Andrew Walbran <qwandor@google.com> Thu Nov 16 19:32:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 16 19:32:37 2023 +0000
tree da4fe6705d87c59b0dc8b89be2b010e729b04b6d
parent ee44933c7d04edd8b58a0cd26601d8b0af13c160
parent 333e019ee7c1c69749491d4e38d267871de942d9

Migrate to cargo_embargo. am: e790bbd85d am: 56768c5db5 am: 333e019ee7

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/jni/+/2832459

Change-Id: I969c30353d4836e0a06165ab0455cf796ace466e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index dc64828..0b2e481 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 {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 39b0f84..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.uwb"
-  ],
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": 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..9b3ad03
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.uwb"
+  ],
+  "min_sdk_version": "29",
+  "tests": true
+}