Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1711)

Unified Diff: blimp/BUILD.gn

Issue 2043403004: Create a Dockerfile.base and ensure it is included in build tarballs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pull in new apt-get and move testing Dockerfile as suggested. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | blimp/Dockerfile » ('j') | blimp/engine/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/BUILD.gn
diff --git a/blimp/BUILD.gn b/blimp/BUILD.gn
index 7d056b927ce87075fc1475c00e84bdc2be05e3e2..a13bfb4be0d8f20d9642ce8e5bba110e8f6ba76d 100644
--- a/blimp/BUILD.gn
+++ b/blimp/BUILD.gn
@@ -146,7 +146,8 @@ if (is_linux) {
# These form the arguments to the script.
_rebased_out_dir = rebase_path(root_out_dir)
- _rebased_dockerfile = rebase_path("//blimp/Dockerfile")
+ _rebased_dockerfile = rebase_path("//blimp/engine/testing/Dockerfile")
+ _rebased_dockerfile_base = rebase_path("//blimp/tools/Dockerfile.base")
_bundle = "$root_out_dir/blimp_engine_env_tests_bundle.tar.gz"
# Depending on this ensures that both the manifest is generated
@@ -158,6 +159,7 @@ if (is_linux) {
sources = [
_blimp_engine_env_tests_manifest,
_rebased_dockerfile,
+ _rebased_dockerfile_base,
]
outputs = [
_bundle,
@@ -167,6 +169,7 @@ if (is_linux) {
_rebased_out_dir,
"--filelist",
_rebased_dockerfile,
+ _rebased_dockerfile_base,
"--manifest",
_rebased_blimp_engine_env_tests_manifest,
"--output",
« no previous file with comments | « no previous file | blimp/Dockerfile » ('j') | blimp/engine/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698