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

Commit 45fb1f8c authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Move config.proto -> proto/rootcanal/configuration.proto"... 

Merge "RootCanal: Move config.proto -> proto/rootcanal/configuration.proto" into main am: 04eaaf4c

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



Change-Id: I0a086d4acfdefae9736c9c7db71fe82a4d3b90c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d6bbf55 04eaaf4c

tools/rootcanal/Android.bp

+0 −12
Original line number Diff line number Diff line
@@ -139,18 +139,6 @@ cc_library_static { 
    include_dirs: ["packages/modules/Bluetooth/system/gd"],

}



// This library contains the generated headers for the

// RootCanal configuration file / parameter.

cc_library_static {

    name: "librootcanal_config",

    host_supported: true,

    vendor_available: true,

    proto: {

        export_proto_headers: true,

    },

    srcs: ["config.proto"],

}



// This library implements a foreigh function interface over DualModeController

// compatible with Python or Rust.

cc_library_host_shared {

tools/rootcanal/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -188,14 +188,14 @@ android_add_library( 


protobuf_generate_with_plugin(

  TARGET librootcanal_config

  PROTOS ${ROOTCANAL_ROOT}/config.proto

  PROTOS ${ROOTCANAL_ROOT}/proto/rootcanal/configuration.proto

  APPEND_PATH

  PROTOPATH -I${AOSP_ROOT}/external/protobuf/src

  PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/config)

  PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/proto/rootcanal)



target_include_directories(

  librootcanal_config

  PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/config ${AOSP_ROOT}/external/protobuf/src)

  PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/proto ${AOSP_ROOT}/external/protobuf/src)



target_link_libraries(librootcanal_config

                      PRIVATE protobuf::libprotobuf)

tools/rootcanal/model/controller/controller_properties.h

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
#include <string>

#include <vector>



#include "config.pb.h"

#include "hci/address.h"

#include "hci/hci_packets.h"

#include "rootcanal/configuration.pb.h"



namespace rootcanal {

using bluetooth::hci::HciVersion;

tools/rootcanal/proto/Android.bp

0 → 100644
+25 −0
Original line number Diff line number Diff line 
filegroup {

    name: "rootcanal-protos",

    srcs: [

        "rootcanal/configuration.proto",

    ],

}



// This library contains the generated headers for the

// RootCanal configuration file / parameter.

cc_library_static {

    name: "librootcanal_config",

    host_supported: true,

    vendor_available: true,

    proto: {

        export_proto_headers: true,

        canonical_path_from_root: false,

        include_dirs: [

            "packages/modules/Bluetooth/tools/rootcanal/proto",

        ],

    },

    shared_libs: [

        "libprotobuf-cpp-full",

    ],

    srcs: [":rootcanal-protos"],

}