aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 15:25:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 15:25:35 +0000
commit48d3410e9b88ac3cc2ba41e844d3ce2c1b2dedc9 (patch)
treea58342d2d96eb418e9b72f4f689ad9502857b05f
parenta0aaed3ef39242b9b94593d0484764ea331513c8 (diff)
parent08b5ced634fba3d992cf4ffa6e62760c4370ea64 (diff)
downloadjni-sys-48d3410e9b88ac3cc2ba41e844d3ce2c1b2dedc9.tar.gz
Migrate to cargo_embargo. am: 08b5ced634
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/jni-sys/+/2832655 Change-Id: I16aae359de439395bc01a922397806437df2eecb 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 db6a826..d6d3550 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..ccd8460
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.uwb"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false
+}