aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-12-18 17:21:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-18 17:21:45 +0000
commit4550435281c1b5506f9bdf6effac1eae3f8eff3f (patch)
tree4302d6741f5304fc6d37021c22f8bb44595f0c66
parenta45002a27d7934338e2c06c577f3f5668e2df8a2 (diff)
parent5a8788aa8c1071c5c784db1833e2a02d96365cb1 (diff)
downloadmerge_derive-main.tar.gz
Migrate to cargo_embargo. am: 08283ba53f am: 046f1fb756 am: 5a8788aa8cHEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2877376 Change-Id: Ie274c08bb1d9e3435459b2ed5c66cdbb702c69ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json3
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 52facb1..badacee 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 1be49f0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..0742578
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "package": {
+ "merge_derive": {
+ "device_supported": false
+ }
+ },
+ "run_cargo": false
+}