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

Side by Side Diff: chrome/browser/BUILD.gn

Issue 1202713002: Replace enhanced bookmarks salient images with favicons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add chrome_browser_bookmark_android_sources back to chrome/browser/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
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/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//third_party/protobuf/proto_library.gni") 9 import("//third_party/protobuf/proto_library.gni")
10 10
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 "//components/feedback", 626 "//components/feedback",
627 "//device/core", 627 "//device/core",
628 "//device/devices_app:lib", 628 "//device/devices_app:lib",
629 "//device/usb", 629 "//device/usb",
630 ] 630 ]
631 } 631 }
632 632
633 if (is_android) { 633 if (is_android) {
634 sources += 634 sources +=
635 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") 635 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome")
636 sources += rebase_path(gypi_values.chrome_browser_bookmark_android_sources, 636 sources += rebase_path(gypi_values.chrome_browser_bookmark_android_sources,
Kibeom Kim (inactive) 2015/06/23 21:02:50 Do we want to remove this one? Previously added h
Theresa 2015/06/23 21:47:44 Currently it's still needed because I split the bo
637 ".", 637 ".",
638 "//chrome") 638 "//chrome")
639 deps += [ 639 deps += [
640 ":client_discourse_context_proto", 640 ":client_discourse_context_proto",
641 ":delta_file_proto", 641 ":delta_file_proto",
642 ":jni_headers", 642 ":jni_headers",
643 "//components/cdm/browser", 643 "//components/cdm/browser",
644 "//components/enhanced_bookmarks", 644 "//components/enhanced_bookmarks",
645 "//components/resources:components_resources", 645 "//components/resources:components_resources",
646 "//components/resources/enhanced_bookmarks:enhanced_bookmarks_resources",
647 "//components/service_tab_launcher", 646 "//components/service_tab_launcher",
648 "//components/web_contents_delegate_android", 647 "//components/web_contents_delegate_android",
649 "//third_party/android_opengl/etc1", 648 "//third_party/android_opengl/etc1",
650 "//third_party/android_tools:cpu_features", 649 "//third_party/android_tools:cpu_features",
651 "//third_party/libaddressinput:util", 650 "//third_party/libaddressinput:util",
652 ] 651 ]
653 deps -= [ 652 deps -= [
654 "//third_party/libaddressinput", 653 "//third_party/libaddressinput",
655 "//components/storage_monitor", 654 "//components/storage_monitor",
656 "//components/web_modal", 655 "//components/web_modal",
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 ] 1178 ]
1180 } 1179 }
1181 1180
1182 if (enable_wifi_bootstrapping) { 1181 if (enable_wifi_bootstrapping) {
1183 sources += [ 1182 sources += [
1184 "local_discovery/wifi/mock_wifi_manager.cc", 1183 "local_discovery/wifi/mock_wifi_manager.cc",
1185 "local_discovery/wifi/mock_wifi_manager.h", 1184 "local_discovery/wifi/mock_wifi_manager.h",
1186 ] 1185 ]
1187 } 1186 }
1188 } 1187 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698