diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:14:38 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:14:38 +0000 |
commit | 25cceb08c4ce75f35c1e56a0b8474cda735194f7 (patch) | |
tree | 2e4fcf8cb0393566c83c3292c845b3b95c86afac | |
parent | be59e71aea50702c7f0fbdb5d015eb14129c53fc (diff) | |
parent | aed99d21caec70de07c009c76262620e16934c0a (diff) | |
download | byteorder-25cceb08c4ce75f35c1e56a0b8474cda735194f7.tar.gz |
Snap for 10453563 from aed99d21caec70de07c009c76262620e16934c0a to mainline-uwb-releaseaml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-release
Change-Id: Id24b35252a8129e63e8dbae76a11596b97491f12
-rw-r--r-- | Android.bp | 19 | ||||
-rw-r--r-- | TEST_MAPPING | 35 | ||||
-rw-r--r-- | cargo2android.json | 5 | ||||
-rw-r--r-- | cargo2android_nostd.bp | 15 |
4 files changed, 46 insertions, 28 deletions
@@ -52,7 +52,24 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.virt", + "//apex_available:anyapex", + ], + product_available: true, + vendor_available: true, +} + +rust_library_rlib { + name: "libbyteorder_nostd", + crate_name: "byteorder", + cargo_env_compat: true, + cargo_pkg_version: "1.4.3", + srcs: ["src/lib.rs"], + edition: "2018", + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", ], vendor_available: true, } diff --git a/TEST_MAPPING b/TEST_MAPPING index 2868693..f3abb20 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,49 +1,38 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "ZipFuseTest" + "path": "external/rust/crates/hashlink" }, { - "name": "apkdmverity.test" + "path": "external/rust/crates/virtio-drivers" }, { - "name": "libapkverify.integration_test" + "path": "external/rust/crates/zerocopy" }, { - "name": "libapkverify.test" + "path": "packages/modules/Virtualization/apkdmverity" }, { - "name": "libidsig.test" + "path": "packages/modules/Virtualization/avmd" }, { - "name": "microdroid_manager_test" + "path": "packages/modules/Virtualization/libs/apexutil" }, { - "name": "virtualizationservice_device_test" - } - ], - "presubmit-rust": [ - { - "name": "ZipFuseTest" - }, - { - "name": "apkdmverity.test" - }, - { - "name": "libapkverify.integration_test" + "path": "packages/modules/Virtualization/libs/apkverify" }, { - "name": "libapkverify.test" + "path": "packages/modules/Virtualization/microdroid_manager" }, { - "name": "libidsig.test" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "microdroid_manager_test" + "path": "packages/modules/Virtualization/vm" }, { - "name": "virtualizationservice_device_test" + "path": "packages/modules/Virtualization/zipfuse" } ] } diff --git a/cargo2android.json b/cargo2android.json index 721cc1a..e63efdb 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,8 +1,5 @@ { - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], + "add-toplevel-block": "cargo2android_nostd.bp", "dependencies": true, "device": true, "run": true, diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp new file mode 100644 index 0000000..1db2e43 --- /dev/null +++ b/cargo2android_nostd.bp @@ -0,0 +1,15 @@ +rust_library_rlib { + name: "libbyteorder_nostd", + crate_name: "byteorder", + cargo_env_compat: true, + cargo_pkg_version: "1.4.3", + srcs: ["src/lib.rs"], + edition: "2018", + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], + vendor_available: true, +}
\ No newline at end of file |