Merge "floss: Uprev bindgen to 0.64" am: 5ac56f18a6 (6bb0ff83) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/rust/packets/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ build = "build.rs"

		[dependencies]

		bindgen = "0.59"
		bindgen = "0.64"
		bytes = "1.0"
		num-derive = "0.3"
		num-traits = "0.2"

system/gd/rust/shim/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ bluetooth_rs = { path = "../stack" }
		bt_packets = { path = "../packets" }

		# All external dependencies. Keep all versions at build/rust/Cargo.toml
		bindgen = "0.59"
		bindgen = "0.64"
		bytes = "1.0"
		cxx = { version = "1.0.42", features = ["c++17"] }
		env_logger = "0.8"

system/gd/rust/topshim/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ tokio-stream = "0.1"
		bitflags ="1.2"

		[build-dependencies]
		bindgen = "0.59"
		bindgen = "0.64"
		pkg-config = "0.3"

		[lib]

tools/rootcanal/Cargo.lock

deleted100644 → 0

+0 −535

Original line number	Diff line number	Diff line
		# This file is automatically @generated by Cargo.
		# It is not intended for manual editing.
		version = 3

		[[package]]
		name = "aho-corasick"
		version = "0.7.18"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
		dependencies = [
		"memchr",
		]

		[[package]]
		name = "ansi_term"
		version = "0.11.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
		dependencies = [
		"winapi",
		]

		[[package]]
		name = "atty"
		version = "0.2.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
		dependencies = [
		"hermit-abi",
		"libc",
		"winapi",
		]

		[[package]]
		name = "autocfg"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

		[[package]]
		name = "bindgen"
		version = "0.59.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
		dependencies = [
		"bitflags",
		"cexpr",
		"clang-sys",
		"clap",
		"env_logger",
		"lazy_static",
		"lazycell",
		"log",
		"peeking_take_while",
		"proc-macro2",
		"quote",
		"regex",
		"rustc-hash",
		"shlex",
		"which",
		]

		[[package]]
		name = "bitflags"
		version = "1.3.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

		[[package]]
		name = "bt_packets"
		version = "0.0.1"
		dependencies = [
		"bindgen",
		"bytes",
		"num-derive",
		"num-traits",
		"thiserror",
		"walkdir",
		]

		[[package]]
		name = "bytes"
		version = "1.2.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"

		[[package]]
		name = "cexpr"
		version = "0.6.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
		dependencies = [
		"nom",
		]

		[[package]]
		name = "cfg-if"
		version = "1.0.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

		[[package]]
		name = "clang-sys"
		version = "1.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
		dependencies = [
		"glob",
		"libc",
		"libloading",
		]

		[[package]]
		name = "clap"
		version = "2.33.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
		dependencies = [
		"ansi_term",
		"atty",
		"bitflags",
		"strsim",
		"textwrap",
		"unicode-width",
		"vec_map",
		]

		[[package]]
		name = "either"
		version = "1.8.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"

		[[package]]
		name = "env_logger"
		version = "0.9.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
		dependencies = [
		"atty",
		"humantime",
		"log",
		"regex",
		"termcolor",
		]

		[[package]]
		name = "getrandom"
		version = "0.2.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
		dependencies = [
		"cfg-if",
		"libc",
		"wasi",
		]

		[[package]]
		name = "glob"
		version = "0.3.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"

		[[package]]
		name = "hermit-abi"
		version = "0.1.18"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"

		[[package]]
		name = "humantime"
		version = "2.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

		[[package]]
		name = "lazy_static"
		version = "1.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

		[[package]]
		name = "lazycell"
		version = "1.3.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

		[[package]]
		name = "libc"
		version = "0.2.132"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"

		[[package]]
		name = "libloading"
		version = "0.7.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
		dependencies = [
		"cfg-if",
		"winapi",
		]

		[[package]]
		name = "lmp"
		version = "0.1.0"
		dependencies = [
		"bt_packets",
		"bytes",
		"num-bigint",
		"num-derive",
		"num-integer",
		"num-traits",
		"paste",
		"pin-utils",
		"rand",
		"thiserror",
		]

		[[package]]
		name = "log"
		version = "0.4.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
		dependencies = [
		"cfg-if",
		]

		[[package]]
		name = "memchr"
		version = "2.5.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

		[[package]]
		name = "minimal-lexical"
		version = "0.2.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

		[[package]]
		name = "nom"
		version = "7.1.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
		dependencies = [
		"memchr",
		"minimal-lexical",
		]

		[[package]]
		name = "num-bigint"
		version = "0.4.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
		dependencies = [
		"autocfg",
		"num-integer",
		"num-traits",
		]

		[[package]]
		name = "num-derive"
		version = "0.3.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		]

		[[package]]
		name = "num-integer"
		version = "0.1.45"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
		dependencies = [
		"autocfg",
		"num-traits",
		]

		[[package]]
		name = "num-traits"
		version = "0.2.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
		dependencies = [
		"autocfg",
		]

		[[package]]
		name = "once_cell"
		version = "1.13.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"

		[[package]]
		name = "paste"
		version = "1.0.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"

		[[package]]
		name = "peeking_take_while"
		version = "0.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"

		[[package]]
		name = "pin-utils"
		version = "0.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

		[[package]]
		name = "ppv-lite86"
		version = "0.2.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"

		[[package]]
		name = "proc-macro2"
		version = "1.0.44"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
		dependencies = [
		"unicode-ident",
		]

		[[package]]
		name = "quote"
		version = "1.0.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
		dependencies = [
		"proc-macro2",
		]

		[[package]]
		name = "rand"
		version = "0.8.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
		dependencies = [
		"libc",
		"rand_chacha",
		"rand_core",
		]

		[[package]]
		name = "rand_chacha"
		version = "0.3.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
		dependencies = [
		"ppv-lite86",
		"rand_core",
		]

		[[package]]
		name = "rand_core"
		version = "0.6.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
		dependencies = [
		"getrandom",
		]

		[[package]]
		name = "regex"
		version = "1.6.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
		dependencies = [
		"aho-corasick",
		"memchr",
		"regex-syntax",
		]

		[[package]]
		name = "regex-syntax"
		version = "0.6.27"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"

		[[package]]
		name = "rustc-hash"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

		[[package]]
		name = "same-file"
		version = "1.0.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
		dependencies = [
		"winapi-util",
		]

		[[package]]
		name = "shlex"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"

		[[package]]
		name = "strsim"
		version = "0.8.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

		[[package]]
		name = "syn"
		version = "1.0.101"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
		dependencies = [
		"proc-macro2",
		"quote",
		"unicode-ident",
		]

		[[package]]
		name = "termcolor"
		version = "1.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
		dependencies = [
		"winapi-util",
		]

		[[package]]
		name = "textwrap"
		version = "0.11.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
		dependencies = [
		"unicode-width",
		]

		[[package]]
		name = "thiserror"
		version = "1.0.32"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
		dependencies = [
		"thiserror-impl",
		]

		[[package]]
		name = "thiserror-impl"
		version = "1.0.32"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		]

		[[package]]
		name = "unicode-ident"
		version = "1.0.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"

		[[package]]
		name = "unicode-width"
		version = "0.1.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"

		[[package]]
		name = "vec_map"
		version = "0.8.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"

		[[package]]
		name = "walkdir"
		version = "2.3.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
		dependencies = [
		"same-file",
		"winapi",
		"winapi-util",
		]

		[[package]]
		name = "wasi"
		version = "0.11.0+wasi-snapshot-preview1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

		[[package]]
		name = "which"
		version = "4.3.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
		dependencies = [
		"either",
		"libc",
		"once_cell",
		]

		[[package]]
		name = "winapi"
		version = "0.3.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
		dependencies = [
		"winapi-i686-pc-windows-gnu",
		"winapi-x86_64-pc-windows-gnu",
		]

		[[package]]
		name = "winapi-i686-pc-windows-gnu"
		version = "0.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

		[[package]]
		name = "winapi-util"
		version = "0.1.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"

		[[package]]
		name = "winapi-x86_64-pc-windows-gnu"
		version = "0.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"