aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-02-22 21:07:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-22 21:07:07 +0000
commitf9b0e9d29d16f567f06d64a7b4e3089949000259 (patch)
tree29665b56449db3da520a1953ba004b582fc4140e
parent20a762f28d2103b8bca909924690e1b9c74824aa (diff)
parent1674decba9c9bcaf02e41b51963f3d185c31b225 (diff)
downloadenv_logger-f9b0e9d29d16f567f06d64a7b4e3089949000259.tar.gz
Merge "Add virtmanager to the virt APEX" am: a4b5ceecba am: 168e17506c am: d8b7f453e8 am: 1674decba9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/1589297 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieb5aeb76a7f7ab1b87ee9432d6c2274a5bf04a54
-rw-r--r--Android.bp4
-rw-r--r--patches/Android.bp.patch15
2 files changed, 19 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index bc33026..20af602 100644
--- a/Android.bp
+++ b/Android.bp
@@ -145,6 +145,10 @@ rust_library {
rustlibs: [
"liblog_rust",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
// dependent_library ["feature_list"]
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..524b483
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,15 @@
+diff --git a/Android.bp b/Android.bp
+index a1abfe9..0dadb42 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -109,6 +109,10 @@ rust_library {
+ rustlibs: [
+ "liblog_rust",
+ ],
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.virt",
++ ],
+ }
+
+ // dependent_library ["feature_list"]