commit 230d7d695b922e814e1f87dd18ccdd5de2c5ccc5
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 22 17:34:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 22 17:34:40 2021 +0000
tree 0f951e25bdf42ed5ac2f2d6d3ff102772fb79624
parent 4b9aecb29d0f900e461d48398aaa0747fd9f9f9b
parent 2ed40b25a211588c62fd6675948ccc94c83872e2

Merge "Add virtmanager to the virt APEX" am: 2ed40b25a2

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1589298

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b7592c3dd2dc298dc2fe458fad7c096dade61b0

Android.bp

diff --git a/Android.bp b/Android.bp
index 7ae65d4..925b79c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,10 @@
         "libryu",
         "libserde",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 // dependent_library ["feature_list"]

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..01eddb2
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,15 @@
+diff --git a/Android.bp b/Android.bp
+index 11e3e28..173735d 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -18,6 +18,10 @@ rust_library {
+         "libryu",
+         "libserde",
+     ],
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+ }
+ 
+ // dependent_library ["feature_list"]