diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-16 00:13:51 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-16 00:13:51 +0000 |
commit | 099cd52cac4fefe8910d07e71679704a215cc8db (patch) | |
tree | 844ee2157e5b3f316f75f240afd2005305603718 | |
parent | 7cebd4e9066dbf09e15aec8694c591025e5bfcf1 (diff) | |
parent | 3b6bb30ec98f5480fe43315caeae1a8445b6927b (diff) | |
download | proc-macro2-android14-qpr2-s4-release.tar.gz |
Snap for 11104212 from 3b6bb30ec98f5480fe43315caeae1a8445b6927b to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I3a18e99554871de5ab0522dd35274d69ee6e1bfa
-rw-r--r-- | Android.bp | 148 | ||||
-rw-r--r-- | cargo2android.json | 6 | ||||
-rw-r--r-- | cargo_embargo.json | 13 |
3 files changed, 136 insertions, 31 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -41,7 +41,7 @@ rust_library_host { name: "libproc_macro2", crate_name: "proc_macro2", cargo_env_compat: true, - cargo_pkg_version: "1.0.66", + cargo_pkg_version: "1.0.69", srcs: ["src/lib.rs"], edition: "2021", features: [ @@ -50,24 +50,25 @@ rust_library_host { "span-locations", ], cfgs: [ + "proc_macro_span", "span_locations", "wrap_proc_macro", ], - rustlibs: [ - "libunicode_ident", - ], + rustlibs: ["libunicode_ident"], compile_multilib: "first", - product_available: true, - vendor_available: true, } -rust_defaults { - name: "proc-macro2_test_defaults", - crate_name: "proc_macro2", +rust_test_host { + name: "proc-macro2_test_tests_comments", + crate_name: "comments", cargo_env_compat: true, - cargo_pkg_version: "1.0.66", + cargo_pkg_version: "1.0.69", + srcs: ["tests/comments.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2021", features: [ "default", @@ -75,6 +76,7 @@ rust_defaults { "span-locations", ], cfgs: [ + "proc_macro_span", "span_locations", "wrap_proc_macro", ], @@ -87,55 +89,151 @@ rust_defaults { } rust_test_host { - name: "proc-macro2_test_tests_comments", - defaults: ["proc-macro2_test_defaults"], - srcs: ["tests/comments.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test_host { name: "proc-macro2_test_tests_features", - defaults: ["proc-macro2_test_defaults"], + crate_name: "features", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/features.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2021", + features: [ + "default", + "proc-macro", + "span-locations", + ], + cfgs: [ + "proc_macro_span", + "span_locations", + "wrap_proc_macro", + ], + rustlibs: [ + "libproc_macro2", + "libquote", + "libunicode_ident", + ], + proc_macros: ["librustversion"], } rust_test_host { name: "proc-macro2_test_tests_marker", - defaults: ["proc-macro2_test_defaults"], + crate_name: "marker", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/marker.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2021", + features: [ + "default", + "proc-macro", + "span-locations", + ], + cfgs: [ + "proc_macro_span", + "span_locations", + "wrap_proc_macro", + ], + rustlibs: [ + "libproc_macro2", + "libquote", + "libunicode_ident", + ], + proc_macros: ["librustversion"], } rust_test_host { name: "proc-macro2_test_tests_test", - defaults: ["proc-macro2_test_defaults"], + crate_name: "test", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2021", + features: [ + "default", + "proc-macro", + "span-locations", + ], + cfgs: [ + "proc_macro_span", + "span_locations", + "wrap_proc_macro", + ], + rustlibs: [ + "libproc_macro2", + "libquote", + "libunicode_ident", + ], + proc_macros: ["librustversion"], } rust_test_host { name: "proc-macro2_test_tests_test_fmt", - defaults: ["proc-macro2_test_defaults"], + crate_name: "test_fmt", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_fmt.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2021", + features: [ + "default", + "proc-macro", + "span-locations", + ], + cfgs: [ + "proc_macro_span", + "span_locations", + "wrap_proc_macro", + ], + rustlibs: [ + "libproc_macro2", + "libquote", + "libunicode_ident", + ], + proc_macros: ["librustversion"], } rust_test_host { name: "proc-macro2_test_tests_test_size", - defaults: ["proc-macro2_test_defaults"], + crate_name: "test_size", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_size.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2021", + features: [ + "default", + "proc-macro", + "span-locations", + ], + cfgs: [ + "proc_macro_span", + "span_locations", + "wrap_proc_macro", + ], + rustlibs: [ + "libproc_macro2", + "libquote", + "libunicode_ident", + ], + proc_macros: ["librustversion"], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 45a2954..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "features": "default,span-locations", - "host-first-multilib": true, - "run": true, - "tests": true -}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..a64c9e4 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,13 @@ +{ + "features": [ + "default", + "span-locations" + ], + "package": { + "proc-macro2": { + "device_supported": false, + "host_first_multilib": true + } + }, + "tests": true +} |