aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 06:07:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 06:07:15 +0000
commit15ae901655fedbc70bad1b044b5fb96dfedcbd2f (patch)
treecc383aa63a92e45e2807b173964749955fc74815
parented6224d64941fb1812c093b2bfeafde4d700d591 (diff)
parentde9b4256dca02280844ce677ac1f27d384de4a8f (diff)
downloadlinkme-15ae901655fedbc70bad1b044b5fb96dfedcbd2f.tar.gz
Migrate to cargo_embargo. am: 1be1fde9f3 am: de9b4256dc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/linkme/+/2822528 Change-Id: Ibb0b5a3b7f964667cf17bad48e024a65ee843e9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json3
3 files changed, 4 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index ce589d8..80f74b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
-
-
rust_library {
name: "liblinkme",
host_supported: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 1b6cca2..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}