aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-02-22 17:34:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-22 17:34:39 +0000
commit168e17506cce243aed6dc55c185870f7130b48f9 (patch)
tree29665b56449db3da520a1953ba004b582fc4140e
parent786361061cb6ca078a25a8095005eed6a457dfb9 (diff)
parenta4b5ceecba190cf160da887d81d6d8fff28c24d4 (diff)
downloadenv_logger-168e17506cce243aed6dc55c185870f7130b48f9.tar.gz
Merge "Add virtmanager to the virt APEX" am: a4b5ceecba
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/1589297 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b2b29f192a73a73511e88074dc42f59f4fe564e
-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"]