mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

docker: Put libvda.pc under /pkgconfig/

Browse source 
Put a dummy pc file for libvda under /docker/pkgconfig/ instead of generating
at the runtime.

This is a fix for CL:2133987, but shouldn't change any behavior.

BUG=none
TEST=build_crosvm_base.sh && build_crosvm.sh with CL:1973973

Change-Id: Ifd7677abf14346ca2e7a9bc48b5ebb6c519b78aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2145533
Tested-by: Keiichi Watanabe <keiichiw@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
This commit is contained in:
Keiichi Watanabe 2020-04-10 20:14:28 +09:00 committed by Commit Bot
parent 5cf5af601e
commit d8d9556184
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/Dockerfile
View file

@ -124,9 +124,6 @@ RUN git clone https://chromium.googlesource.com/chromiumos/platform2 $PLATFORM2_
&& cp librendernodehost.a /lib \ && cp librendernodehost.a /lib \
&& git clean -f && git clean -f
# Create a dummy pc file for libvda to run 'cargo check' with video features.
RUN echo "Name: libvda_pc\nDescription:\nVersion:0.1\nLibs: -lvda" > /usr/lib/pkgconfig/libvda.pc
# Set up sysroot from which system_api proto files are built. # Set up sysroot from which system_api proto files are built.
ENV SYSROOT=/sysroot ENV SYSROOT=/sysroot
RUN mkdir -p $SYSROOT/usr/include/chromeos/dbus/trunks \ RUN mkdir -p $SYSROOT/usr/include/chromeos/dbus/trunks \
@ -134,7 +131,8 @@ RUN mkdir -p $SYSROOT/usr/include/chromeos/dbus/trunks \
$SYSROOT/usr/include/chromeos/dbus/trunks $SYSROOT/usr/include/chromeos/dbus/trunks
# Inform pkg-config where libraries we install are placed. # Inform pkg-config where libraries we install are placed.
COPY pkgconfig/* /usr/lib/pkgconfig # Also, copy a dummy libvda.pc to compile crosvm with video features.
COPY pkgconfig/* /usr/lib/pkgconfig/
# Reduces image size and prevents accidentally using /scratch files # Reduces image size and prevents accidentally using /scratch files
RUN rm -r /scratch /usr/bin/meson RUN rm -r /scratch /usr/bin/meson

4
docker/pkgconfig/libvda.pc Normal file
View file

@ -0,0 +1,4 @@
Name: libvda
Description: CrOS VDA Connection Library
Version: 0.1
Libs: -lvda