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

Side by Side Diff: chrome/BUILD.gn

Issue 1202713002: Replace enhanced bookmarks salient images with favicons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Line wraps in EnhanacedBookmarkItem.java 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/android/java/res/layout/eb_item.xml » ('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 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 } 559 }
560 560
561 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms 561 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms
562 # it them copies it. This skipes the copy step and writes it to the final 562 # it them copies it. This skipes the copy step and writes it to the final
563 # location. 563 # location.
564 if (is_mac || is_ios) { 564 if (is_mac || is_ios) {
565 output = "$root_gen_dir/repack/resources.pak" 565 output = "$root_gen_dir/repack/resources.pak"
566 } else { 566 } else {
567 output = "$root_out_dir/resources.pak" 567 output = "$root_out_dir/resources.pak"
568 } 568 }
569
570 if (is_android) {
571 sources += [ "$root_gen_dir/components/resources/enhanced_bookmarks/enhanced _bookmarks_resources.pak" ]
572 deps += [ "//components/resources/enhanced_bookmarks:enhanced_bookmarks_reso urces" ]
573 }
574 } 569 }
575 570
576 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak 571 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
577 repack("browser_tests_pak") { 572 repack("browser_tests_pak") {
578 sources = [ 573 sources = [
579 "$root_gen_dir/chrome/options_test_resources.pak", 574 "$root_gen_dir/chrome/options_test_resources.pak",
580 ] 575 ]
581 output = "$root_out_dir/browser_tests.pak" 576 output = "$root_out_dir/browser_tests.pak"
582 deps = [ 577 deps = [
583 "//chrome/browser/resources:options_test_resources", 578 "//chrome/browser/resources:options_test_resources",
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 rebase_path(chrome_binary, root_build_dir), 831 rebase_path(chrome_binary, root_build_dir),
837 rebase_path(symbol_file, root_build_dir), 832 rebase_path(symbol_file, root_build_dir),
838 ] 833 ]
839 834
840 deps = [ 835 deps = [
841 ":chrome", 836 ":chrome",
842 dump_syms_label, 837 dump_syms_label,
843 ] 838 ]
844 } 839 }
845 } 840 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/layout/eb_item.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698