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

Side by Side Diff: blimp/engine/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 unified diff | Download patch
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//mojo/public/tools/bindings/mojom.gni") 9 import("//mojo/public/tools/bindings/mojom.gni")
10 import("//tools/grit/repack.gni") 10 import("//tools/grit/repack.gni")
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 # we can be sure that everything is built before the action is 525 # we can be sure that everything is built before the action is
526 # complete (though not necessarily before we generate the manifest 526 # complete (though not necessarily before we generate the manifest
527 # itself). 527 # itself).
528 deps = [ 528 deps = [
529 ":engine", 529 ":engine",
530 ] 530 ]
531 } 531 }
532 532
533 # Builds and bundles the engine into a tarball that can be used to build a 533 # Builds and bundles the engine into a tarball that can be used to build a
534 # Docker image. 534 # Docker image.
535 action("blimp_engine_bundle") { 535 action("blimp_engine_bundle") {
Sriram 2016/06/16 18:04:08 Should blimp_engine_env_tests_bundle target be upd
Sriram 2016/06/16 18:05:15 grr - coffee time! Ignore this.
536 script = "//blimp/tools/create-bundle.py" 536 script = "//blimp/tools/create-bundle.py"
537 537
538 # These form the arguments to the script. 538 # These form the arguments to the script.
539 _rebased_out_dir = rebase_path(root_out_dir) 539 _rebased_out_dir = rebase_path(root_out_dir)
540 _rebased_dockerfile = rebase_path("//blimp/engine/Dockerfile") 540 _rebased_dockerfile = rebase_path("//blimp/engine/Dockerfile")
541 _rebased_dockerfile_base = rebase_path("//blimp/tools/Dockerfile.base")
541 _rebased_startup_script = rebase_path("//blimp/engine/start_engine.sh") 542 _rebased_startup_script = rebase_path("//blimp/engine/start_engine.sh")
542 _bundle = "$root_out_dir/blimp_engine_bundle.tar.gz" 543 _bundle = "$root_out_dir/blimp_engine_bundle.tar.gz"
543 544
544 # Depending on this ensures that both the manifest is generated 545 # Depending on this ensures that both the manifest is generated
545 # and everything in the manifest has been built. 546 # and everything in the manifest has been built.
546 deps = [ 547 deps = [
547 ":generate_manifest", 548 ":generate_manifest",
548 ] 549 ]
549 550
550 sources = [ 551 sources = [
551 _manifest, 552 _manifest,
552 _rebased_dockerfile, 553 _rebased_dockerfile,
554 _rebased_dockerfile_base,
553 _rebased_startup_script, 555 _rebased_startup_script,
554 ] 556 ]
555 outputs = [ 557 outputs = [
556 _bundle, 558 _bundle,
557 ] 559 ]
558 560
559 # Manually specify the actual arguments to the script. 561 # Manually specify the actual arguments to the script.
560 args = [ 562 args = [
561 "--build-dir", 563 "--build-dir",
562 _rebased_out_dir, 564 _rebased_out_dir,
563 "--filelist", 565 "--filelist",
564 _rebased_dockerfile, 566 _rebased_dockerfile,
567 _rebased_dockerfile_base,
565 _rebased_startup_script, 568 _rebased_startup_script,
566 "--manifest", 569 "--manifest",
567 _rebased_manifest, 570 _rebased_manifest,
568 "--output", 571 "--output",
569 rebase_path(_bundle), 572 rebase_path(_bundle),
570 ] 573 ]
571 } 574 }
572 575
573 # Crash symbols should only be created and uploaded from official builders. 576 # Crash symbols should only be created and uploaded from official builders.
574 if (is_official_build) { 577 if (is_official_build) {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 "//content/test:test_support", 644 "//content/test:test_support",
642 "//testing/gmock", 645 "//testing/gmock",
643 "//testing/gtest", 646 "//testing/gtest",
644 ] 647 ]
645 648
646 data = [ 649 data = [
647 "data/", 650 "data/",
648 "$root_out_dir/blimp_engine.pak", 651 "$root_out_dir/blimp_engine.pak",
649 ] 652 ]
650 } 653 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698