summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 18:06:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 18:06:59 +0000
commit063e3bea92d73e862ee9271415ae1871214649ae (patch)
tree5bc3ea8b1f2ca69cb6970ca3c7bc93cbcd309502
parent4cfc0f6e8bb63bd21b9c141a4fa1f9c644b22f4e (diff)
parent176194c55cc45abdc50ca3627a4c5fd793b340cc (diff)
downloadpin-project-internal-063e3bea92d73e862ee9271415ae1871214649ae.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8a162e8e9f am: 482e6aa64f am: 8ae3480102 am: 176194c55c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project-internal/+/1912504 Change-Id: Ia99c84a9d920aa624fed1cfbd8779771bd11380c
-rw-r--r--Android.bp27
-rw-r--r--TEST_MAPPING8
-rw-r--r--cargo2android.json4
3 files changed, 7 insertions, 32 deletions
diff --git a/Android.bp b/Android.bp
index f9fca18..051fb49 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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