Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4b1d4a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Update cmake pdl_gen definition to support rust_legacy /... 

Merge "RootCanal: Update cmake pdl_gen definition to support rust_legacy / rust output" into main am: 6fda3d9b am: fefe3f4c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3125734



Change-Id: I40d20f2dd10c0262007aec7a088575668662051c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef2ecec9 fefe3f4c

tools/rootcanal/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -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

tools/rootcanal/rust/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -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