aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2021-06-28 19:58:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-28 19:58:42 +0000
commit7fa2e812a1bf5bfcd66d01f9700d354471b6a98b (patch)
tree5d463410b32d0e405ebaeb7aad2130e4796c839f
parent67683e805078827342cf1a1a8ed439c618e4fc63 (diff)
parenta07921d4b5129b9f58181246338c3c1c9a8de4d4 (diff)
downloadlibz-sys-7fa2e812a1bf5bfcd66d01f9700d354471b6a98b.tar.gz
make the lib available to com.android.virt am: 02ab0708bb am: f625921778 am: 40e0441bd0 am: a07921d4b5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1748448 Change-Id: Icaefc9508dd1cf07c26e014ba172914767d20b6f
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json10
2 files changed, 16 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index cb3ac47..fcd5aff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -62,6 +62,10 @@ rust_library {
"liblibc",
],
shared_libs: ["libz"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_defaults {
@@ -97,5 +101,5 @@ rust_test {
// dependent_library ["feature_list"]
// cc-1.0.68
-// libc-0.2.95 "default,std"
+// libc-0.2.97 "default,std"
// pkg-config-0.3.19
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..72ca2d4
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "run": true,
+ "tests": true
+}