aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-12-15 12:47:44 +0000
committerAndrew Walbran <qwandor@google.com>2023-12-15 12:51:31 +0000
commit08283ba53f83d9fb0c7592b6e8da256ae087b95c (patch)
tree4302d6741f5304fc6d37021c22f8bb44595f0c66
parente9e63c057e6a2427bf7ac520db004f0d886e8c08 (diff)
downloadmerge_derive-08283ba53f83d9fb0c7592b6e8da256ae087b95c.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I9472aadbed3332404a3a920e9f1fe6ff34e18bd3
-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
+}