aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 18:23:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 18:23:57 +0000
commit5a879ef88f5c87f51c7d8840f712457ae4efa435 (patch)
treeda4fe6705d87c59b0dc8b89be2b010e729b04b6d
parent4c0307b922130e4185937584abbbae2fe3cb5fbe (diff)
parente790bbd85d80b428381b5e0497070bb35da9f7bb (diff)
downloadjni-5a879ef88f5c87f51c7d8840f712457ae4efa435.tar.gz
Migrate to cargo_embargo. am: e790bbd85d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/jni/+/2832459 Change-Id: I01fe4ac9ed37682818a85b8dc0f42cefa09790fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json10
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 11 deletions
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 {
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
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
+}