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

Commit 9996fbcb authored by Ludovic Barman's avatar Ludovic Barman Committed by Automerger Merge Worker
Browse files

Merge "Rust protobuf 2->3: Update Bluetooth" into main am: b2d30d48 

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



Change-Id: I9a536a46dbe5d92c8e3019a775610c08ab38d2da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e867ba4 b2d30d48

build.py

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,10 @@ class HostBuild(): 
        self.custom_env['CXX_ROOT_PATH'] = os.path.join(self.platform_dir, 'bt')

        self.custom_env['CROS_SYSTEM_API_ROOT'] = os.path.join(self.platform_dir, 'system_api')

        self.custom_env['CXX_OUTDIR'] = self._gn_default_output()



        # On ChromeOS, this is /usr/bin/grpc_rust_plugin

        # In the container, this is /root/.cargo/bin/grpc_rust_plugin

        self.custom_env['GRPC_RUST_PLUGIN_PATH'] = shutil.which('grpc_rust_plugin')

        self.env.update(self.custom_env)



    def print_env(self):

floss/build/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ RUN /tmp/rustup.sh -y --default-toolchain 1.68.2 
ENV PATH="/root/.cargo/bin:${PATH}"



# Install cargo packages required on build image.

RUN cargo install --locked cxxbridge-cmd@1.0.94 pdl-compiler@0.1.1

RUN cargo install --locked cxxbridge-cmd@1.0.94 pdl-compiler@0.1.1 grpcio-compiler@0.13.0



# Rename llvm packages. By default, they are named 11vm-ar-13, etc. which won't

# work properly with the build.

system/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ rust_protobuf { 
        "com.android.btservices",

    ],

    min_sdk_version: "30",

    use_protobuf3: true,

}



rust_protobuf {
@@ -169,6 +170,7 @@ rust_protobuf { 
    source_stem: "topshim_facade",

    host_supported: true,

    grpc_protos: ["blueberry/facade/topshim/facade.proto"],

    use_protobuf3: true,

}



genrule {

system/gd/rust/common/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ edition = "2018" 
cxx = "1.0"

env_logger = "0.8"

futures = "0.3.13"

grpcio = "0.9"

grpcio = { version = "0.13.0", default-features = false, features = ["protobufv3-codec", "openssl"] }

lazy_static = "1.4"

log = "0.4"

nix = { version = "0.27.1", features = ["time", "user"] }

system/gd/rust/facade/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ rust_library { 
        "libgddi",

        "libgrpcio",

        "liblog_rust",

        "libprotobuf_deprecated",

        "libprotobuf",

        "libtokio",

    ],

}
@@ -75,7 +75,7 @@ rust_library { 
        "libfutures",

        "libgrpcio",

        "liblog_rust",

        "libprotobuf_deprecated",

        "libprotobuf",

        "libtokio",

    ],

    min_sdk_version: "30",