From 6590e9b8b9e8e6eeeac86d99382f12ab334b5d7a Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 5 Apr 2019 12:33:58 -0700 Subject: [PATCH] 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 Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: Stephen Barber --- kokoro/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kokoro/Dockerfile b/kokoro/Dockerfile index 042737ae5f..0354b01dae 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