Merge "RootCanal: Move packets/hci/hci_packets.pdl -> packets/hci_packets.pdl" into main (dc5f8111) · Commits · e / os / android_packages_modules_Bluetooth

tools/rootcanal/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ genrule {
		" $(location :pdl_python_generator)" +
		" --output $(out) --custom-type-location py.bluetooth",
		srcs: [
		"packets/hci/hci_packets.pdl",
		"packets/hci_packets.pdl",
		],
		out: [
		"hci_packets.py",
		@@ -420,7 +420,7 @@ genrule {
		" --include-header hci/address.h" +
		" --output $(out)",
		srcs: [
		"packets/hci/hci_packets.pdl",
		"packets/hci_packets.pdl",
		],
		out: [
		"packets/hci_packets.h",
		@@ -472,6 +472,6 @@ genrule {
		genrule {
		name: "rootcanal_hci_packets_rust_gen",
		defaults: ["pdl_rust_generator_defaults"],
		srcs: ["packets/hci/hci_packets.pdl"],
		srcs: ["packets/hci_packets.pdl"],
		out: ["hci_packets.rs"],
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ endfunction()

		pdl_gen(
		NAME BluetoothGeneratedPackets_h
		INPUT ${ROOTCANAL_ROOT}/packets/hci/hci_packets.pdl
		INPUT ${ROOTCANAL_ROOT}/packets/hci_packets.pdl
		OUTPUT packets/hci_packets.h
		LANG c++
		NAMESPACE "bluetooth::hci"

+0 −0

File moved.

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ message(STATUS "Enabling bluetooth LMP module.")

		pdl_gen(
		NAME hci_packets_rs
		INPUT ${ROOTCANAL_ROOT}/packets/hci/hci_packets.pdl
		INPUT ${ROOTCANAL_ROOT}/packets/hci_packets.pdl
		OUTPUT hci_packets.rs
		LANG rust)

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ fn main() {
		install_generated_module(
		"hci_packets.rs",
		"HCI_PACKETS_PREBUILT",
		&PathBuf::from("../packets/hci/hci_packets.pdl").canonicalize().unwrap(),
		&PathBuf::from("../packets/hci_packets.pdl").canonicalize().unwrap(),
		);
		}