| 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 "//components/resources:components_resources", | 576 "//components/resources:components_resources", |
| 577 "//components/web_contents_delegate_android", | 577 "//components/web_contents_delegate_android", |
| 578 "//third_party/android_opengl/etc1", | 578 "//third_party/android_opengl/etc1", |
| 579 ] | 579 ] |
| 580 deps -= [ | 580 deps -= [ |
| 581 "//third_party/libaddressinput", | 581 "//third_party/libaddressinput", |
| 582 "//components/feedback", | 582 "//components/feedback", |
| 583 "//components/storage_monitor", | 583 "//components/storage_monitor", |
| 584 "//components/web_modal", | 584 "//components/web_modal", |
| 585 ] | 585 ] |
| 586 } else { | |
| 587 sources += rebase_path(gypi_values.chrome_browser_non_android_sources, | |
| 588 ".", | |
| 589 "//chrome") | |
| 590 } | 586 } |
| 591 | 587 |
| 592 if (is_mac) { | 588 if (is_mac) { |
| 593 deps += [ | 589 deps += [ |
| 594 "//third_party/google_toolbox_for_mac", | 590 "//third_party/google_toolbox_for_mac", |
| 595 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) | 591 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) |
| 596 ] | 592 ] |
| 597 libs += [ | 593 libs += [ |
| 598 "Accelerate.framework", | 594 "Accelerate.framework", |
| 599 "AddressBook.framework", | 595 "AddressBook.framework", |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1047 ] | 1043 ] |
| 1048 } | 1044 } |
| 1049 | 1045 |
| 1050 if (enable_wifi_bootstrapping) { | 1046 if (enable_wifi_bootstrapping) { |
| 1051 sources += [ | 1047 sources += [ |
| 1052 "local_discovery/wifi/mock_wifi_manager.cc", | 1048 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1053 "local_discovery/wifi/mock_wifi_manager.h", | 1049 "local_discovery/wifi/mock_wifi_manager.h", |
| 1054 ] | 1050 ] |
| 1055 } | 1051 } |
| 1056 } | 1052 } |
| OLD | NEW |