aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 00:55:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 00:55:49 +0000
commit9537b47e45f5c6b40152f0ca527d80bb4da9a5a3 (patch)
treed6b03abc374321cfda6465f17f46addeb655faaf
parent7c40f94b23181ee284ba9e733667a364e00afdbd (diff)
parente0fa9664109cefc33b12f14023646a05e3f94dd3 (diff)
downloadcombine-9537b47e45f5c6b40152f0ca527d80bb4da9a5a3.tar.gz
Migrate to cargo_embargo. am: e0fa966410
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2826452 Change-Id: I8152459408c650de5e4519465fc3d14a98442ccd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 9446583..546f464 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 6852966..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.uwb"
- ],
- "device": true,
- "min-sdk-version": "29",
- "run": 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
+}