commit f71e3e4b67715ff631977695f270e24b04eebb4d
author Victor Hsieh <victorhsieh@google.com> Thu Jan 07 13:05:06 2021 -0800
committer Victor Hsieh <victorhsieh@google.com> Thu Jan 07 13:05:06 2021 -0800
tree 1fe928a093ae07f172447eb103ce48f5325895ab
parent f32bc367f4577290dbf12b4c298ded4c930a86a7

Add libmemoffset to com.android.virt apex

This is a new dependency in newer crosvm.

Bug: 174797066
Test: m
Change-Id: I03032d4d80d2e89e5766dd0d5feca1577c3231a9

Android.bp

diff --git a/Android.bp b/Android.bp
index 37f0f91..efa8362 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,10 @@
         "--cfg maybe_uninit",
         "--cfg tuple_ty",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_defaults {

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 6acbe2c..76d4a07 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,8 +1,19 @@
 diff --git a/Android.bp b/Android.bp
-index fafdf41..81766e3 100644
+index eb63f7c..efa8362 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -30,7 +30,8 @@ rust_defaults {
+@@ -13,6 +13,10 @@ rust_library {
+         "--cfg maybe_uninit",
+         "--cfg tuple_ty",
+     ],
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+ }
+ 
+ rust_defaults {
+@@ -30,7 +34,8 @@ rust_defaults {
          "--cfg tuple_ty",
      ],
      rustlibs: [