diff options
| author | Dylan Reid <dgreid@chromium.org> | 2019-01-24 06:44:17 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-24 07:43:34 -0800 |
| commit | 1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50 (patch) | |
| tree | 8fd11c6a9d08b0f1775363d855b54b5fe726676b /kokoro | |
| parent | de6b29ab9d1a90a56874e6b33d35b5bf077acbfc (diff) | |
| download | crosvm-1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50.tar crosvm-1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50.tar.gz crosvm-1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50.tar.bz2 crosvm-1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50.tar.lz crosvm-1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50.tar.xz crosvm-1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50.tar.zst crosvm-1be25dc3d2ce8afe41d0fe7fe7b157c3f1787b50.zip | |
kokoro: Add a symlink to crosvm for other crates
Some crates that are needed for crosvm need crates that live inside the crosvm directory. To allow those crates to be used, add a symlink that allows access to the crosvm source code from a path equivalent to that used inside the Chrome OS chroot. In particular, the cras crate is needed by devices and devices needs the data_model and sys_util crates. Creating a platform/crosvm directory parallel to the third_party/adhd directory lets the build of the cras crates find their dependencies. Signed-off-by: Dylan Reid <dgreid@chromium.org> Change-Id: I2a1e28638e80c8008b1ecc29c2b0b69cba1c13e2 Reviewed-on: https://chromium-review.googlesource.com/1433518 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Chih-Yang Hsia <paulhsia@chromium.org>
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/Dockerfile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kokoro/Dockerfile b/kokoro/Dockerfile index 311b134..30590dd 100644 --- a/kokoro/Dockerfile +++ b/kokoro/Dockerfile @@ -113,6 +113,12 @@ RUN ldconfig ENV CROS_ROOT=/ ENV THIRD_PARTY_ROOT=$CROS_ROOT/third_party RUN mkdir -p $THIRD_PARTY_ROOT +ENV PLATFORM_ROOT=$CROS_ROOT/platform +RUN mkdir -p $PLATFORM_ROOT + +# Allow other crates to depend on crosvm provided crates by linking to the +# crosvm source from a relative path. +RUN ln -s /src $PLATFORM_ROOT/crosvm # Pull the cras library for audio access. RUN git clone https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd |