diff options
| author | David Tolnay <dtolnay@chromium.org> | 2019-04-05 12:33:58 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-07 16:31:18 -0700 |
| commit | 6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a (patch) | |
| tree | 1b71a00617c33f86bfc02c264f999cb332ff3caf /kokoro | |
| parent | 0b902e68d7ac35eeb0c41dba9c4f7a7e86d2ccc1 (diff) | |
| download | crosvm-6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a.tar crosvm-6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a.tar.gz crosvm-6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a.tar.bz2 crosvm-6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a.tar.lz crosvm-6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a.tar.xz crosvm-6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a.tar.zst crosvm-6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a.zip | |
kokoro: Install dbus-1 and dbus protos
The trunks interface.proto will be required for the TPM device to communicate TPM commands to the Trunks daemon and receive back TPM responses. BUG=chromium:911799 TEST=kokoro with and without CL:1554982 Change-Id: I557d38172767137c20a108275e0157d9b1f687e6 Reviewed-on: https://chromium-review.googlesource.com/1554879 Commit-Ready: David Tolnay <dtolnay@chromium.org> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Stephen Barber <smbarber@chromium.org>
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/Dockerfile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kokoro/Dockerfile b/kokoro/Dockerfile index 042737a..0354b01 100644 --- a/kokoro/Dockerfile +++ b/kokoro/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \ g++ \ git \ libcap-dev \ + libdbus-1-dev \ libdrm-dev \ libfdt-dev \ libegl1-mesa-dev \ @@ -109,6 +110,12 @@ RUN git clone https://chromium.googlesource.com/chromiumos/platform2 \ && ar rcs librendernodehost.a src.o \ && cp librendernodehost.a /lib +# Set up sysroot from which system_api proto files are built. +ENV SYSROOT=/sysroot +RUN mkdir -p $SYSROOT/usr/include/chromeos/dbus/trunks \ + && cp platform2/trunks/interface.proto \ + $SYSROOT/usr/include/chromeos/dbus/trunks + # Inform pkg-config where libraries we install are placed. COPY pkgconfig/* /usr/lib/pkgconfig |