diff options
author | Frederick Mayle <fmayle@google.com> | 2024-02-01 19:57:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-01 19:57:55 +0000 |
commit | e6e2706f059d2951209d7a061c6ae726f327deff (patch) | |
tree | 67f27a8c4baae18b14b5c944a9aa6190072c41ec | |
parent | 3757e9a1883507beb99b94ada2a8cb3c417b7510 (diff) | |
parent | 8b418a36cf4969b93cfd3c731bd2477a734b2a11 (diff) | |
download | p9-e6e2706f059d2951209d7a061c6ae726f327deff.tar.gz |
add cargo_embargo.json and Android.bp am: 8b418a36cf
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/p9/+/2938122
Change-Id: Ie0f1191cd125a6d077a460ef53d846b592bb8872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 77 | ||||
-rw-r--r-- | Android.bp.patch | 34 | ||||
-rw-r--r-- | cargo_embargo.json | 10 |
3 files changed, 121 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..085721a --- /dev/null +++ b/Android.bp @@ -0,0 +1,77 @@ +// This file is generated by cargo_embargo. +// Do not modify this file as changes will be overridden on upgrade. + +package { + default_applicable_licenses: ["external_rust_crates_p9_license"], +} + +license { + name: "external_rust_crates_p9_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD-3-Clause", + ], + license_text: [ + "LICENSE", + ], +} + +rust_library { + name: "libp9", + host_supported: true, + crate_name: "p9", + cargo_env_compat: true, + cargo_pkg_version: "0.2.3", + srcs: ["src/lib.rs"], + edition: "2021", + rustlibs: [ + "liblibc", + "libserde", + ], + proc_macros: ["libp9_wire_format_derive"], + compile_multilib: "first", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + product_available: true, + vendor_available: true, + // Doesn't compile on 32-bit targets. + target: { + android_arm: { + enabled: false, + }, + android_x86: { + enabled: false, + }, + }, +} + +rust_test { + name: "p9_test_src_lib", + host_supported: true, + crate_name: "p9", + cargo_env_compat: true, + cargo_pkg_version: "0.2.3", + srcs: ["src/lib.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + test_options: { + unit_test: true, + }, + edition: "2021", + rustlibs: [ + "liblibc", + "libserde", + ], + proc_macros: ["libp9_wire_format_derive"], + // Doesn't compile on 32-bit targets. + target: { + android_arm: { + enabled: false, + }, + android_x86: { + enabled: false, + }, + }, +} diff --git a/Android.bp.patch b/Android.bp.patch new file mode 100644 index 0000000..477ac21 --- /dev/null +++ b/Android.bp.patch @@ -0,0 +1,34 @@ +diff --git a/Android.bp b/Android.bp +index 7aa485c..085721a 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -36,6 +36,15 @@ rust_library { + ], + product_available: true, + vendor_available: true, ++ // Doesn't compile on 32-bit targets. ++ target: { ++ android_arm: { ++ enabled: false, ++ }, ++ android_x86: { ++ enabled: false, ++ }, ++ }, + } + + rust_test { +@@ -56,4 +65,13 @@ rust_test { + "libserde", + ], + proc_macros: ["libp9_wire_format_derive"], ++ // Doesn't compile on 32-bit targets. ++ target: { ++ android_arm: { ++ enabled: false, ++ }, ++ android_x86: { ++ enabled: false, ++ }, ++ }, + } diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..2004b22 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,10 @@ +{ + "run_cargo": false, + "tests": true, + "package": { + "p9": { + "patch": "Android.bp.patch", + "host_first_multilib": true + } + } +} |