| OLD | NEW |
| 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 | 8 |
| 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which | 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which |
| 10 # produces a conflict for the "grit" template so we have to only include one. | 10 # produces a conflict for the "grit" template so we have to only include one. |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 "//components/component_updater", | 86 "//components/component_updater", |
| 87 "//components/content_settings/core/browser", | 87 "//components/content_settings/core/browser", |
| 88 "//components/content_settings/core/common", | 88 "//components/content_settings/core/common", |
| 89 "//components/crx_file", | 89 "//components/crx_file", |
| 90 "//components/data_reduction_proxy/core/browser", | 90 "//components/data_reduction_proxy/core/browser", |
| 91 "//components/device_event_log", | 91 "//components/device_event_log", |
| 92 "//components/domain_reliability", | 92 "//components/domain_reliability", |
| 93 "//components/enhanced_bookmarks", | 93 "//components/enhanced_bookmarks", |
| 94 "//components/favicon_base", | 94 "//components/favicon_base", |
| 95 "//components/favicon/core", | 95 "//components/favicon/core", |
| 96 "//components/feedback", |
| 96 "//components/gcm_driver", | 97 "//components/gcm_driver", |
| 97 "//components/google/core/browser", | 98 "//components/google/core/browser", |
| 98 "//components/handoff", | 99 "//components/handoff", |
| 99 "//components/history/core/browser", | 100 "//components/history/core/browser", |
| 100 "//components/history/core/browser:proto", | 101 "//components/history/core/browser:proto", |
| 101 "//components/history/core/common", | 102 "//components/history/core/common", |
| 102 "//components/infobars/core", | 103 "//components/infobars/core", |
| 103 "//components/invalidation", | 104 "//components/invalidation", |
| 104 "//components/metrics:gpu", | 105 "//components/metrics:gpu", |
| 105 "//components/metrics:net", | 106 "//components/metrics:net", |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 if (is_android || is_ios) { | 576 if (is_android || is_ios) { |
| 576 # Mobile. | 577 # Mobile. |
| 577 sources += | 578 sources += |
| 578 rebase_path(gypi_values.chrome_browser_mobile_sources, ".", "//chrome") | 579 rebase_path(gypi_values.chrome_browser_mobile_sources, ".", "//chrome") |
| 579 } else { | 580 } else { |
| 580 # Non-mobile. | 581 # Non-mobile. |
| 581 sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources, | 582 sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources, |
| 582 ".", | 583 ".", |
| 583 "//chrome") | 584 "//chrome") |
| 584 deps += [ | 585 deps += [ |
| 585 "//components/feedback", | |
| 586 "//device/core", | 586 "//device/core", |
| 587 "//device/usb", | 587 "//device/usb", |
| 588 ] | 588 ] |
| 589 } | 589 } |
| 590 | 590 |
| 591 if (is_android) { | 591 if (is_android) { |
| 592 sources += | 592 sources += |
| 593 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") | 593 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") |
| 594 deps += [ | 594 deps += [ |
| 595 ":jni_headers", | 595 ":jni_headers", |
| 596 "//components/cdm/browser", | 596 "//components/cdm/browser", |
| 597 "//components/data_reduction_proxy/content/browser", | 597 "//components/data_reduction_proxy/content/browser", |
| 598 "//components/enhanced_bookmarks", | 598 "//components/enhanced_bookmarks", |
| 599 "//components/resources:components_resources", | 599 "//components/resources:components_resources", |
| 600 "//components/web_contents_delegate_android", | 600 "//components/web_contents_delegate_android", |
| 601 "//third_party/android_opengl/etc1", | 601 "//third_party/android_opengl/etc1", |
| 602 "//third_party/libaddressinput:util", | 602 "//third_party/libaddressinput:util", |
| 603 ] | 603 ] |
| 604 deps -= [ | 604 deps -= [ |
| 605 "//third_party/libaddressinput", | 605 "//third_party/libaddressinput", |
| 606 "//components/feedback", |
| 606 "//components/storage_monitor", | 607 "//components/storage_monitor", |
| 607 "//components/web_modal", | 608 "//components/web_modal", |
| 608 ] | 609 ] |
| 609 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] | 610 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] |
| 610 } | 611 } |
| 611 | 612 |
| 612 if (is_mac) { | 613 if (is_mac) { |
| 613 deps += [ | 614 deps += [ |
| 614 "//third_party/google_toolbox_for_mac", | 615 "//third_party/google_toolbox_for_mac", |
| 615 "//third_party/mozilla", | 616 "//third_party/mozilla", |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1098 ] | 1099 ] |
| 1099 } | 1100 } |
| 1100 | 1101 |
| 1101 if (enable_wifi_bootstrapping) { | 1102 if (enable_wifi_bootstrapping) { |
| 1102 sources += [ | 1103 sources += [ |
| 1103 "local_discovery/wifi/mock_wifi_manager.cc", | 1104 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1104 "local_discovery/wifi/mock_wifi_manager.h", | 1105 "local_discovery/wifi/mock_wifi_manager.h", |
| 1105 ] | 1106 ] |
| 1106 } | 1107 } |
| 1107 } | 1108 } |
| OLD | NEW |