| 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 import("//components/nacl/nacl_defines.gni") | 8 import("//components/nacl/nacl_defines.gni") |
| 9 | 9 |
| 10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which | 10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 "//device/usb", | 597 "//device/usb", |
| 598 ] | 598 ] |
| 599 } | 599 } |
| 600 | 600 |
| 601 if (is_android) { | 601 if (is_android) { |
| 602 sources += | 602 sources += |
| 603 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") | 603 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") |
| 604 deps += [ | 604 deps += [ |
| 605 ":jni_headers", | 605 ":jni_headers", |
| 606 "//components/cdm/browser", | 606 "//components/cdm/browser", |
| 607 "//components/data_reduction_proxy/content", |
| 607 "//components/enhanced_bookmarks", | 608 "//components/enhanced_bookmarks", |
| 608 "//components/resources:components_resources", | 609 "//components/resources:components_resources", |
| 609 "//components/web_contents_delegate_android", | 610 "//components/web_contents_delegate_android", |
| 610 "//third_party/android_opengl/etc1", | 611 "//third_party/android_opengl/etc1", |
| 611 "//third_party/libaddressinput:util", | 612 "//third_party/libaddressinput:util", |
| 612 ] | 613 ] |
| 613 deps -= [ | 614 deps -= [ |
| 614 "//third_party/libaddressinput", | 615 "//third_party/libaddressinput", |
| 615 "//components/feedback", | 616 "//components/feedback", |
| 616 "//components/storage_monitor", | 617 "//components/storage_monitor", |
| 617 "//components/web_modal", | 618 "//components/web_modal", |
| 618 ] | 619 ] |
| 620 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] |
| 619 } | 621 } |
| 620 | 622 |
| 621 if (is_mac) { | 623 if (is_mac) { |
| 622 deps += [ | 624 deps += [ |
| 623 "//third_party/google_toolbox_for_mac", | 625 "//third_party/google_toolbox_for_mac", |
| 624 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) | 626 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) |
| 625 ] | 627 ] |
| 626 libs += [ | 628 libs += [ |
| 627 "Accelerate.framework", | 629 "Accelerate.framework", |
| 628 "AddressBook.framework", | 630 "AddressBook.framework", |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 ] | 1115 ] |
| 1114 } | 1116 } |
| 1115 | 1117 |
| 1116 if (enable_wifi_bootstrapping) { | 1118 if (enable_wifi_bootstrapping) { |
| 1117 sources += [ | 1119 sources += [ |
| 1118 "local_discovery/wifi/mock_wifi_manager.cc", | 1120 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1119 "local_discovery/wifi/mock_wifi_manager.h", | 1121 "local_discovery/wifi/mock_wifi_manager.h", |
| 1120 ] | 1122 ] |
| 1121 } | 1123 } |
| 1122 } | 1124 } |
| OLD | NEW |