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

Side by Side Diff: chrome/BUILD.gn

Issue 1153283005: Revert "Revert of Refactor get_salient_image_url.js to use DocumentImageExtractor" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add closure_out_dir var to components/resources/enhanced_bookmarks/BUILD.gn Created 5 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
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/locales.gni") 7 import("//build/config/locales.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//chrome/chrome_repack_locales.gni") 9 import("//chrome/chrome_repack_locales.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 } 561 }
562 562
563 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms 563 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms
564 # it them copies it. This skipes the copy step and writes it to the final 564 # it them copies it. This skipes the copy step and writes it to the final
565 # location. 565 # location.
566 if (is_mac || is_ios) { 566 if (is_mac || is_ios) {
567 output = "$root_gen_dir/repack/resources.pak" 567 output = "$root_gen_dir/repack/resources.pak"
568 } else { 568 } else {
569 output = "$root_out_dir/resources.pak" 569 output = "$root_out_dir/resources.pak"
570 } 570 }
571
572 if (is_android) {
573 sources += [ "$root_gen_dir/components/resources/enhanced_bookmarks/enhanced _bookmarks_resources.pak" ]
574 deps += [ "//components/resources/enhanced_bookmarks:enhanced_bookmarks_reso urces" ]
575 }
571 } 576 }
572 577
573 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak 578 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
574 repack("browser_tests_pak") { 579 repack("browser_tests_pak") {
575 sources = [ 580 sources = [
576 "$root_gen_dir/chrome/options_test_resources.pak", 581 "$root_gen_dir/chrome/options_test_resources.pak",
577 ] 582 ]
578 output = "$root_out_dir/browser_tests.pak" 583 output = "$root_out_dir/browser_tests.pak"
579 deps = [ 584 deps = [
580 "//chrome/browser/resources:options_test_resources", 585 "//chrome/browser/resources:options_test_resources",
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 802
798 args = [ 803 args = [
799 rebase_path(infile, root_build_dir), 804 rebase_path(infile, root_build_dir),
800 rebase_path(outfile, root_build_dir), 805 rebase_path(outfile, root_build_dir),
801 "-e s/@@NAME@@/$name/", 806 "-e s/@@NAME@@/$name/",
802 "-e s/@@FILENAME@@/$filename/", 807 "-e s/@@FILENAME@@/$filename/",
803 "-e s/@@CONFDIR@@/$confdir/", 808 "-e s/@@CONFDIR@@/$confdir/",
804 ] 809 ]
805 } 810 }
806 } 811 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698