aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@google.com>2021-01-08 19:05:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-08 19:05:53 +0000
commitb9a7cfbc2c0d33a38b3d26a6902264353997210a (patch)
tree0ba90e5a8259907c8e0964319446bbaf8e83495a
parentb66091ba8c5d6ccbd61e40ba4804edfe40d93604 (diff)
parent8ddd42f4c75b4676a7bf414fd7fd99cb7a4bdf6c (diff)
downloadcfg-if-b9a7cfbc2c0d33a38b3d26a6902264353997210a.tar.gz
Add cfg-if to com.android.virt apex am: 50ee8e4c4e am: 8ddd42f4c7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cfg-if/+/1543024 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5e182e30ef556528673259606b6eb292eb50cf61
-rw-r--r--Android.bp1
-rw-r--r--patches/Android.bp.patch9
2 files changed, 7 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 3ba7541..82b7964 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,6 +50,7 @@ rust_library {
apex_available: [
"//apex_available:platform",
"com.android.resolv",
+ "com.android.virt",
],
min_sdk_version: "29",
}
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",
}