From f6064259d57f9d53b5c7fa6fb0aba453bddaa07c Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Fri, 2 Jun 2023 08:31:17 +0000 Subject: floss: Add dependency on pdl-compiler Add a dependency on pdl-compiler in preparation for using it to replace bluetooth_packetgen for Rust. Bug: 283991766 Tag: #floss Test: Rebuild docker container Change-Id: Iba2213f9b8cde1a061c457cac0b56a6a7759067e --- build.py | 2 +- floss/build/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.py b/build.py index ac8d265868..93903be845 100755 --- a/build.py +++ b/build.py @@ -139,7 +139,7 @@ REQUIRED_APT_PACKAGES = [ ] # List of cargo packages required for linux build -REQUIRED_CARGO_PACKAGES = ['cxxbridge-cmd'] +REQUIRED_CARGO_PACKAGES = ['cxxbridge-cmd', 'pdl-compiler'] APT_PKG_LIST = ['apt', '-qq', 'list'] CARGO_PKG_LIST = ['cargo', 'install', '--list'] diff --git a/floss/build/Dockerfile b/floss/build/Dockerfile index ed9bfbfb3b..4d803b895c 100644 --- a/floss/build/Dockerfile +++ b/floss/build/Dockerfile @@ -65,7 +65,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 cxxbridge-cmd --version 1.0.94 +RUN cargo install cxxbridge-cmd@1.0.94 pdl-compiler@0.1.1 # Rename llvm packages. By default, they are named 11vm-ar-13, etc. which won't # work properly with the build. -- cgit v1.2.3-59-g8ed1b