diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:15 +0000 |
commit | c4db92b8abee8080d6601b0ec80b84ba029581bd (patch) | |
tree | 00fe53f7072cf5925a83e0b055faaff773e15382 | |
parent | 5c459bca12a3973cea6d321f10b3952d9dcd02ff (diff) | |
parent | a8ab0ad4917dabb5a2c4fd37439e4f8094b3e515 (diff) | |
download | bindgen-c4db92b8abee8080d6601b0ec80b84ba029581bd.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 245db42fda am: 0dff52646f am: a8ab0ad491
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bindgen/+/1912184
Change-Id: I1704487c86aea460335e835aa29284b09a6f1b70
-rw-r--r-- | Android.bp | 43 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 23 insertions, 39 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --features=clap,runtime,which-rustfmt --host-first-multilib --copy-out. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -43,7 +43,10 @@ genrule { rust_binary_host { name: "bindgen", + // has rustc warnings crate_name: "bindgen", + cargo_env_compat: true, + cargo_pkg_version: "0.59.1", srcs: [ "src/main.rs", ":copy_bindgen_build_out", @@ -76,7 +79,10 @@ rust_binary_host { rust_library_host { name: "libbindgen", + // has rustc warnings crate_name: "bindgen", + cargo_env_compat: true, + cargo_pkg_version: "0.59.1", srcs: [ "src/lib.rs", ":copy_bindgen_build_out", @@ -105,38 +111,3 @@ rust_library_host { ], compile_multilib: "first", } - -// dependent_library ["feature_list"] -// ansi_term-0.11.0 -// atty-0.2.14 -// bitflags-1.2.1 "default" -// bitvec-0.19.5 "alloc,std" -// cexpr-0.5.0 -// cfg-if-1.0.0 -// clang-sys-1.2.0 "clang_3_5,clang_3_6,clang_3_7,clang_3_8,clang_3_9,clang_4_0,clang_5_0,clang_6_0,libloading,runtime" -// clap-2.33.3 "ansi_term,atty,color,default,strsim,suggestions,vec_map" -// funty-1.1.0 -// glob-0.3.0 -// lazy_static-1.4.0 -// lazycell-1.3.0 -// libc-0.2.98 "default,std" -// libloading-0.7.0 -// memchr-2.3.4 "std,use_std" -// nom-6.2.1 "alloc,bitvec,funty,std" -// peeking_take_while-0.1.2 -// proc-macro2-1.0.28 -// quote-1.0.9 -// radium-0.5.3 -// regex-1.4.6 "std,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment" -// regex-syntax-0.6.25 "unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment" -// rustc-hash-1.1.0 "default,std" -// shlex-1.0.0 -// strsim-0.8.0 -// tap-1.0.1 -// textwrap-0.11.0 -// unicode-width-0.1.8 "default" -// unicode-xid-0.2.2 "default" -// vec_map-0.8.2 -// version_check-0.9.3 -// which-3.1.1 -// wyz-0.2.0 "alloc" diff --git a/TEST_MAPPING b/TEST_MAPPING index d87563d..e4ec3b3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,17 +1,24 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/libsqlite3-sys" + } + ], "presubmit": [ { "name": "keystore2_test" }, { "name": "legacykeystore_test" - }, + } + ], + "presubmit-rust": [ { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "keystore2_test" }, { - "name": "libsqlite3_bindgen_test" + "name": "legacykeystore_test" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..9e5e68b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,6 @@ +{ + "copy-out": true, + "features": "clap,runtime,which-rustfmt", + "host-first-multilib": true, + "run": true +}
\ No newline at end of file |