aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2020-12-15 19:20:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-15 19:20:18 +0000
commit8811fea08c89d5b9e03d75b210b6ac3a3b4d2b77 (patch)
tree4dbae9166891306b19fa13279f53c117ec7cb827
parent169af702c7fe260e40d200be387de6bdf7c1e02c (diff)
parent392a0288e6dd1c35cfc7862818ba1ea2e14111e9 (diff)
downloadnum_cpus-8811fea08c89d5b9e03d75b210b6ac3a3b4d2b77.tar.gz
add crosvm to com.android.virt am: 59144aa25a am: 12525ef84b am: 392a0288e6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/1527783 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4f6400b08c7bafde7b1876f8c568eae1a67ff3c3
-rw-r--r--Android.bp8
-rw-r--r--patches/Android.bp.patch15
2 files changed, 21 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 5c46750..45ef004 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --dependencies.
+// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch.
rust_library {
name: "libnum_cpus",
@@ -9,7 +9,11 @@ rust_library {
rustlibs: [
"liblibc",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
// dependent_library ["feature_list"]
-// libc-0.2.65 "default,std"
+// libc-0.2.81 "default,std"
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..968209d
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,15 @@
+diff --git a/Android.bp b/Android.bp
+index 5c46750..fd8d3d0 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -9,6 +9,10 @@ rust_library {
+ rustlibs: [
+ "liblibc",
+ ],
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.virt",
++ ],
+ }
+
+ // dependent_library ["feature_list"]