| 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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 ] | 574 ] |
| 575 } | 575 } |
| 576 | 576 |
| 577 if (is_android) { | 577 if (is_android) { |
| 578 sources += | 578 sources += |
| 579 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") | 579 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") |
| 580 deps += [ | 580 deps += [ |
| 581 ":jni_headers", | 581 ":jni_headers", |
| 582 "//components/cdm/browser", | 582 "//components/cdm/browser", |
| 583 "//components/enhanced_bookmarks", | 583 "//components/enhanced_bookmarks", |
| 584 "//components/history/core/android", | |
| 585 "//components/resources:components_resources", | 584 "//components/resources:components_resources", |
| 586 "//components/web_contents_delegate_android", | 585 "//components/web_contents_delegate_android", |
| 587 "//third_party/android_opengl/etc1", | 586 "//third_party/android_opengl/etc1", |
| 588 ] | 587 ] |
| 589 deps -= [ | 588 deps -= [ |
| 590 "//third_party/libaddressinput", | 589 "//third_party/libaddressinput", |
| 591 "//components/feedback", | 590 "//components/feedback", |
| 592 "//components/storage_monitor", | 591 "//components/storage_monitor", |
| 593 "//components/web_modal", | 592 "//components/web_modal", |
| 594 ] | 593 ] |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 ] | 1062 ] |
| 1064 } | 1063 } |
| 1065 | 1064 |
| 1066 if (enable_wifi_bootstrapping) { | 1065 if (enable_wifi_bootstrapping) { |
| 1067 sources += [ | 1066 sources += [ |
| 1068 "local_discovery/wifi/mock_wifi_manager.cc", | 1067 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1069 "local_discovery/wifi/mock_wifi_manager.h", | 1068 "local_discovery/wifi/mock_wifi_manager.h", |
| 1070 ] | 1069 ] |
| 1071 } | 1070 } |
| 1072 } | 1071 } |
| OLD | NEW |