summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
author Henri Chataing <henrichataing@google.com> 2024-06-11 09:44:18 -0700
committer Henri Chataing <henrichataing@google.com> 2024-06-11 09:48:52 -0700
commit34fc7820300d999a51f180897862b3b6ef1e518b (patch)
tree9fbe12fc5bdc74554c29f6c2521627e381068095 /tools
parente925f1b08283269cbef18e43ca0a987326200f80 (diff)
RootCanal: Update cmake pdl_gen definition to support rust_legacy / rust output
Bug: 331817295 Test: TreeHugger Flag: EXEMPT, build change Change-Id: Ia19cea9daf774f83c4e57c73072a32ba1a4af37a
Diffstat (limited to 'tools')
-rw-r--r--tools/rootcanal/CMakeLists.txt6
-rw-r--r--tools/rootcanal/rust/CMakeLists.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/rootcanal/CMakeLists.txt b/tools/rootcanal/CMakeLists.txt
index 2ca4e61be7..d4791ba6f2 100644
--- a/tools/rootcanal/CMakeLists.txt
+++ b/tools/rootcanal/CMakeLists.txt
@@ -53,12 +53,12 @@ function(pdl_gen)
file(MAKE_DIRECTORY ${pdl_OUTPUT_DIR})
- if(pdl_LANG STREQUAL "rust")
+ if((pdl_LANG STREQUAL "rust") OR (pdl_LANG STREQUAL "rust_legacy"))
add_custom_command(
OUTPUT "${pdl_OUTPUT_ABSOLUTE}"
COMMAND
${pdlc_EXECUTABLE}
- --output-format rust_legacy
+ --output-format "${pdl_LANG}"
"${pdl_INPUT_ABSOLUTE}"
> "${pdl_OUTPUT_ABSOLUTE}"
COMMENT "Generating rust module from ${pdl_INPUT}"
@@ -128,7 +128,7 @@ pdl_gen(
NAME RootCanalGeneratedPackets_rs
INPUT ${ROOTCANAL_ROOT}/packets/link_layer_packets.pdl
OUTPUT link_layer_packets.rs
- LANG rust)
+ LANG rust_legacy)
android_add_library(
TARGET libscriptedbeaconpayload-protos-lite LICENSE Apache-2.0
diff --git a/tools/rootcanal/rust/CMakeLists.txt b/tools/rootcanal/rust/CMakeLists.txt
index 2e7c7cbaa9..71e6c8e70a 100644
--- a/tools/rootcanal/rust/CMakeLists.txt
+++ b/tools/rootcanal/rust/CMakeLists.txt
@@ -4,19 +4,19 @@ pdl_gen(
NAME hci_packets_rs
INPUT ${ROOTCANAL_ROOT}/packets/hci_packets.pdl
OUTPUT hci_packets.rs
- LANG rust)
+ LANG rust_legacy)
pdl_gen(
NAME lmp_packets_rs
INPUT ${ROOTCANAL_ROOT}/rust/lmp_packets.pdl
OUTPUT lmp_packets.rs
- LANG rust)
+ LANG rust_legacy)
pdl_gen(
NAME llcp_packets_rs
INPUT ${ROOTCANAL_ROOT}/rust/llcp_packets.pdl
OUTPUT llcp_packets.rs
- LANG rust)
+ LANG rust_legacy)
# This will automatically register all the tests as well.
corrosion_import_crate(MANIFEST_PATH ${ROOTCANAL_ROOT}/rust/Cargo.toml FLAGS