| 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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 "//device/usb", | 595 "//device/usb", |
| 596 ] | 596 ] |
| 597 } | 597 } |
| 598 | 598 |
| 599 if (is_android) { | 599 if (is_android) { |
| 600 sources += | 600 sources += |
| 601 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") | 601 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") |
| 602 deps += [ | 602 deps += [ |
| 603 ":jni_headers", | 603 ":jni_headers", |
| 604 "//components/cdm/browser", | 604 "//components/cdm/browser", |
| 605 "//components/data_reduction_proxy/content/browser", |
| 605 "//components/enhanced_bookmarks", | 606 "//components/enhanced_bookmarks", |
| 606 "//components/resources:components_resources", | 607 "//components/resources:components_resources", |
| 607 "//components/web_contents_delegate_android", | 608 "//components/web_contents_delegate_android", |
| 608 "//third_party/android_opengl/etc1", | 609 "//third_party/android_opengl/etc1", |
| 609 "//third_party/libaddressinput:util", | 610 "//third_party/libaddressinput:util", |
| 610 ] | 611 ] |
| 611 deps -= [ | 612 deps -= [ |
| 612 "//third_party/libaddressinput", | 613 "//third_party/libaddressinput", |
| 613 "//components/feedback", | 614 "//components/feedback", |
| 614 "//components/storage_monitor", | 615 "//components/storage_monitor", |
| 615 "//components/web_modal", | 616 "//components/web_modal", |
| 616 ] | 617 ] |
| 618 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] |
| 617 } | 619 } |
| 618 | 620 |
| 619 if (is_mac) { | 621 if (is_mac) { |
| 620 deps += [ | 622 deps += [ |
| 621 "//third_party/google_toolbox_for_mac", | 623 "//third_party/google_toolbox_for_mac", |
| 622 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) | 624 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) |
| 623 ] | 625 ] |
| 624 libs += [ | 626 libs += [ |
| 625 "Accelerate.framework", | 627 "Accelerate.framework", |
| 626 "AddressBook.framework", | 628 "AddressBook.framework", |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1109 ] | 1111 ] |
| 1110 } | 1112 } |
| 1111 | 1113 |
| 1112 if (enable_wifi_bootstrapping) { | 1114 if (enable_wifi_bootstrapping) { |
| 1113 sources += [ | 1115 sources += [ |
| 1114 "local_discovery/wifi/mock_wifi_manager.cc", | 1116 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1115 "local_discovery/wifi/mock_wifi_manager.h", | 1117 "local_discovery/wifi/mock_wifi_manager.h", |
| 1116 ] | 1118 ] |
| 1117 } | 1119 } |
| 1118 } | 1120 } |
| OLD | NEW |