| 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 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 "//device/usb", | 581 "//device/usb", |
| 582 ] | 582 ] |
| 583 } | 583 } |
| 584 | 584 |
| 585 if (is_android) { | 585 if (is_android) { |
| 586 sources += | 586 sources += |
| 587 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") | 587 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") |
| 588 deps += [ | 588 deps += [ |
| 589 ":jni_headers", | 589 ":jni_headers", |
| 590 "//components/cdm/browser", | 590 "//components/cdm/browser", |
| 591 "//components/data_reduction_proxy/content", |
| 591 "//components/enhanced_bookmarks", | 592 "//components/enhanced_bookmarks", |
| 592 "//components/resources:components_resources", | 593 "//components/resources:components_resources", |
| 593 "//components/web_contents_delegate_android", | 594 "//components/web_contents_delegate_android", |
| 594 "//third_party/android_opengl/etc1", | 595 "//third_party/android_opengl/etc1", |
| 595 ] | 596 ] |
| 596 deps -= [ | 597 deps -= [ |
| 597 "//third_party/libaddressinput", | 598 "//third_party/libaddressinput", |
| 598 "//components/feedback", | 599 "//components/feedback", |
| 599 "//components/storage_monitor", | 600 "//components/storage_monitor", |
| 600 "//components/web_modal", | 601 "//components/web_modal", |
| 601 ] | 602 ] |
| 603 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] |
| 602 } | 604 } |
| 603 | 605 |
| 604 if (is_mac) { | 606 if (is_mac) { |
| 605 deps += [ | 607 deps += [ |
| 606 "//third_party/google_toolbox_for_mac", | 608 "//third_party/google_toolbox_for_mac", |
| 607 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) | 609 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) |
| 608 ] | 610 ] |
| 609 libs += [ | 611 libs += [ |
| 610 "Accelerate.framework", | 612 "Accelerate.framework", |
| 611 "AddressBook.framework", | 613 "AddressBook.framework", |
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1089 ] | 1091 ] |
| 1090 } | 1092 } |
| 1091 | 1093 |
| 1092 if (enable_wifi_bootstrapping) { | 1094 if (enable_wifi_bootstrapping) { |
| 1093 sources += [ | 1095 sources += [ |
| 1094 "local_discovery/wifi/mock_wifi_manager.cc", | 1096 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1095 "local_discovery/wifi/mock_wifi_manager.h", | 1097 "local_discovery/wifi/mock_wifi_manager.h", |
| 1096 ] | 1098 ] |
| 1097 } | 1099 } |
| 1098 } | 1100 } |
| OLD | NEW |