aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 21:04:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 21:04:16 +0000
commit101d9b9ddc5b2d1ed476ea7ca4e065cb457ade5a (patch)
treeb8d42aea8748d3498c8db89b44c0a8be35e0c447
parent0fb9327e071c59248cf991125199a1eb9f6fd872 (diff)
parent22c62942e230b9932a9a4bc1d6ace849b8f9861d (diff)
downloadserde_json-101d9b9ddc5b2d1ed476ea7ca4e065cb457ade5a.tar.gz
Migrate to cargo_embargo. am: 720d9358fe am: 46d0d70012 am: 22c62942e2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/2832672 Change-Id: If18703df9aea2e1286f360e68e885a84dedc2602 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.json6
3 files changed, 7 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index ab5b517..d448340 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 42b7833..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "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..e519795
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,6 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ]
+}