commit 7fa362f2e1ab997581a920c3e2b45900e4cb6d51
author Victor Hsieh <victorhsieh@google.com> Fri Jan 08 19:33:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 08 19:33:49 2021 +0000
tree 0ba90e5a8259907c8e0964319446bbaf8e83495a
parent 63ff9628784cab532f5c54d5b5e51efa56e5ca8b
parent b9a7cfbc2c0d33a38b3d26a6902264353997210a

Add cfg-if to com.android.virt apex am: 50ee8e4c4e am: 8ddd42f4c7 am: b9a7cfbc2c

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cfg-if/+/1543024

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f79465fda5d87afb07f4d4da607f9d80937cf15

Android.bp

diff --git a/Android.bp b/Android.bp
index 3ba7541..82b7964 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,6 +50,7 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.resolv",
+        "com.android.virt",
     ],
     min_sdk_version: "29",
 }

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 366c2c4..083dd17 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,12 +1,15 @@
---- Android.bp	2020-12-14 21:46:29.182898941 +0900
-+++ Android.bp.new	2020-12-14 21:20:17.887466778 +0900
-@@ -47,4 +47,9 @@ rust_library {
+diff --git a/Android.bp b/Android.bp
+index 78c65e6..82b7964 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -47,4 +47,10 @@ rust_library {
      crate_name: "cfg_if",
      srcs: ["src/lib.rs"],
      edition: "2018",
 +    apex_available: [
 +        "//apex_available:platform",
 +        "com.android.resolv",
++        "com.android.virt",
 +    ],
 +    min_sdk_version: "29",
  }