diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-11-09 16:28:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-09 16:28:18 +0000 |
| commit | cf06e57cd634afba019487c06f944cac2a4e9349 (patch) | |
| tree | 980ccb6bad60f6e507d185333bf3a68b14d6afc3 | |
| parent | 1f789c4cc6133446eb40df2f0c70e69d7630fbdb (diff) | |
| parent | 3177e1e4b95940c5585b7330e653421c4d1cb51e (diff) | |
| download | libc-cf06e57cd634afba019487c06f944cac2a4e9349.tar.gz | |
Add apex_available. am: f3815da7d8 am: 7b11d81805 am: 62e906d88b am: 3177e1e4b9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/1880348
Change-Id: I746e5ae198facc381cddeb521f2a50166c26209e
| -rw-r--r-- | Android.bp | 82 | ||||
| -rw-r--r-- | cargo2android.json | 1 |
2 files changed, 2 insertions, 81 deletions
@@ -37,87 +37,6 @@ license { ], } -rust_defaults { - name: "rust_libc_test_defaults", - crate_name: "libc", - srcs: ["src/lib.rs"], - cargo_env_compat: true, - cargo_pkg_version: "0.2.102", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - features: [ - "default", - "extra_traits", - "std", - ], - cfgs: [ - "freebsd11", - "libc_align", - "libc_cfg_target_vendor", - "libc_const_size_of", - "libc_core_cvoid", - "libc_packedN", - "libc_priv_mod_use", - "libc_union", - ], -} - -rust_test_host { - name: "libc_host_test_src_lib", - defaults: ["rust_libc_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "libc_device_test_src_lib", - defaults: ["rust_libc_test_defaults"], -} - -rust_defaults { - name: "rust_libc_test_defaults_const_fn", - crate_name: "const_fn", - srcs: ["tests/const_fn.rs"], - cargo_env_compat: true, - cargo_pkg_version: "0.2.102", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - features: [ - "default", - "extra_traits", - "std", - ], - cfgs: [ - "freebsd11", - "libc_align", - "libc_cfg_target_vendor", - "libc_const_size_of", - "libc_core_cvoid", - "libc_packedN", - "libc_priv_mod_use", - "libc_union", - ], - rustlibs: [ - "liblibc", - ], -} - -rust_test_host { - name: "libc_host_test_tests_const_fn", - defaults: ["rust_libc_test_defaults_const_fn"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "libc_device_test_tests_const_fn", - defaults: ["rust_libc_test_defaults_const_fn"], -} - rust_library { name: "liblibc", host_supported: true, @@ -145,6 +64,7 @@ rust_library { "//apex_available:platform", "com.android.compos", "com.android.resolv", + "com.android.uwb", "com.android.virt", ], min_sdk_version: "29", diff --git a/cargo2android.json b/cargo2android.json index 81489f23..2d143d1a 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -3,6 +3,7 @@ "//apex_available:platform", "com.android.compos", "com.android.resolv", + "com.android.uwb", "com.android.virt" ], "dependencies": true, |