aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@google.com>2021-01-08 19:33:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-08 19:33:50 +0000
commit2917039e50ee710b729b33da0d598e6038f4c1b0 (patch)
tree1fe928a093ae07f172447eb103ce48f5325895ab
parent71401dbd4a2829c8437b757cef5f62c2b113bfcc (diff)
parent47d7daa443e6418402edbeb4ec5ebe5b641fde40 (diff)
downloadmemoffset-2917039e50ee710b729b33da0d598e6038f4c1b0.tar.gz
Add libmemoffset to com.android.virt apex am: f71e3e4b67 am: 788e96820f am: 47d7daa443
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/memoffset/+/1542993 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I68c13a32452e82104be6920ffedf102093d60ff3
-rw-r--r--Android.bp4
-rw-r--r--patches/Android.bp.patch15
2 files changed, 17 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 37f0f91..efa8362 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,10 @@ rust_library {
"--cfg maybe_uninit",
"--cfg tuple_ty",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_defaults {
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: [