diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:45 +0000 |
| commit | 6179ba6967dcd66003150e3cf40f45c54bc93a30 (patch) | |
| tree | caf4ebefd5b01999bc2d0ce6b45a8ee3f9efe0bb | |
| parent | d3be95ed514b6e037cb99821404dfda681fa418b (diff) | |
| parent | 08002afc504fa6a421d09b393b4d098b045252a3 (diff) | |
| download | libz-sys-6179ba6967dcd66003150e3cf40f45c54bc93a30.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 08002afc50
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1912678
Change-Id: Iff184a14695ffc742e2a87f475e5fec86cf131a9
| -rw-r--r-- | Android.bp | 38 | ||||
| -rw-r--r-- | TEST_MAPPING | 16 | ||||
| -rw-r--r-- | cargo2android.json | 2 |
3 files changed, 18 insertions, 38 deletions
@@ -51,6 +51,8 @@ rust_library { name: "liblibz_sys", host_supported: true, crate_name: "libz_sys", + cargo_env_compat: true, + cargo_pkg_version: "1.1.3", srcs: ["src/lib.rs"], edition: "2015", features: [ @@ -67,39 +69,3 @@ rust_library { "com.android.virt", ], } - -rust_defaults { - name: "libz-sys_defaults", - crate_name: "libz_sys", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - features: [ - "default", - "libc", - "stock-zlib", - ], - rustlibs: [ - "liblibc", - ], - shared_libs: ["libz"], -} - -rust_test_host { - name: "libz-sys_host_test_src_lib", - defaults: ["libz-sys_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "libz-sys_device_test_src_lib", - defaults: ["libz-sys_defaults"], -} - -// dependent_library ["feature_list"] -// cc-1.0.68 -// libc-0.2.97 "default,std" -// pkg-config-0.3.19 diff --git a/TEST_MAPPING b/TEST_MAPPING index 89f3a90..7325ef4 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -11,7 +11,21 @@ "name": "libapkverify.test" }, { - "name": "libz-sys_device_test_src_lib" + "name": "microdroid_manager_test" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "libapkverify.integration_test" + }, + { + "name": "libapkverify.test" }, { "name": "microdroid_manager_test" diff --git a/cargo2android.json b/cargo2android.json index 72ca2d4..ac56e26 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,4 +7,4 @@ "device": true, "run": true, "tests": true -} +}
\ No newline at end of file |