summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Abhishek Pandit-Subedi <abhishekpandit@google.com> 2023-06-02 08:31:17 +0000
committer Henri Chataing <henrichataing@google.com> 2023-06-06 01:13:48 +0000
commitf6064259d57f9d53b5c7fa6fb0aba453bddaa07c (patch)
tree33bff7695fbffdaddfbfe24ccfe5a2ebe736d2f2
parentb3f56567aa9ee39db8a63deacbbc07597f89219a (diff)
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
-rwxr-xr-xbuild.py2
-rw-r--r--floss/build/Dockerfile2
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.