aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2023-03-09 16:08:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-09 16:08:55 +0000
commite6f80ff6690db8775431d5b36055ceaba3a93eff (patch)
treec33e9de21d4d35ffbe2ced3c669a64d6fbfd68a5
parent2689f66a20a9179ff040f7075cf9d3935ecc1adc (diff)
parent423af86c1e35c377d4ab1a67dbfdda120a57da4a (diff)
downloadzip-e6f80ff6690db8775431d5b36055ceaba3a93eff.tar.gz
Make zip available to product and vendor am: 10917f63ba am: 423af86c1e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zip/+/2474830 Change-Id: Idb82025a43093b3e36b2129588afcdd9cb36e881 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--patches/Android.bp.diff4
2 files changed, 5 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 95ddeda..8ccfd4a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,6 +40,8 @@ rust_library {
"//apex_available:platform",
"com.android.virt",
],
+ product_available: true,
+ vendor_available: true,
arch: {
arm: {
rustlibs: ["libcrossbeam_utils"],
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
index c0037cc..dfeb034 100644
--- a/patches/Android.bp.diff
+++ b/patches/Android.bp.diff
@@ -2,10 +2,12 @@ diff --git a/Android.bp b/Android.bp
index 2373253..c0b2349 100644
--- a/Android.bp
+++ b/Android.bp
-@@ -39,4 +39,9 @@ rust_library {
+@@ -39,6 +39,11 @@ rust_library {
"//apex_available:platform",
"com.android.virt",
],
+ product_available: true,
+ vendor_available: true,
+ arch: {
+ arm: {
+ rustlibs: ["libcrossbeam_utils"],