diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:18 +0000 |
commit | 482e6aa64f9aed8729418c7a761d55803382c0dc (patch) | |
tree | 5bc3ea8b1f2ca69cb6970ca3c7bc93cbcd309502 | |
parent | ba297fb2ecf683b3e7ef61b2c491b4f7b4388cf6 (diff) | |
parent | 8a162e8e9f240ea957a52fb2796bfa36a6af671c (diff) | |
download | pin-project-internal-482e6aa64f9aed8729418c7a761d55803382c0dc.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8a162e8e9f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project-internal/+/1912504
Change-Id: I71e3ef99ad34df9f9ab448f6ad2490b0348a8d14
-rw-r--r-- | Android.bp | 27 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 7 insertions, 32 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -42,6 +42,8 @@ license { rust_proc_macro { name: "libpin_project_internal", crate_name: "pin_project_internal", + cargo_env_compat: true, + cargo_pkg_version: "1.0.8", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -50,26 +52,3 @@ rust_proc_macro { "libsyn", ], } - -rust_test_host { - name: "pin-project-internal_host_test_src_lib", - crate_name: "pin_project_internal", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - test_options: { - unit_test: true, - }, - edition: "2018", - rustlibs: [ - "libproc_macro2", - "libquote", - "libsyn", - ], -} - -// dependent_library ["feature_list"] -// proc-macro2-1.0.28 "default,proc-macro" -// quote-1.0.9 "default,proc-macro" -// syn-1.0.74 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" -// unicode-xid-0.2.2 "default" diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index 7e10dd0..0000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by update_crate_tests.py for tests that depend on this crate. -{ - "presubmit": [ - { - "name": "futures-util_device_test_src_lib" - } - ] -} diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..341300b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "run": true, + "tests": true +}
\ No newline at end of file |