| 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 # //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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 } | 502 } |
| 503 | 503 |
| 504 if (is_android) { | 504 if (is_android) { |
| 505 sources += rebase_path(gypi_values.chrome_browser_android_sources, | 505 sources += rebase_path(gypi_values.chrome_browser_android_sources, |
| 506 ".", "//chrome") | 506 ".", "//chrome") |
| 507 deps += [ | 507 deps += [ |
| 508 ":jni_headers", | 508 ":jni_headers", |
| 509 "//components/cdm/browser", | 509 "//components/cdm/browser", |
| 510 "//components/enhanced_bookmarks", | 510 "//components/enhanced_bookmarks", |
| 511 "//components/history/core/android", | 511 "//components/history/core/android", |
| 512 "//components/resources:components_resources", |
| 512 "//components/web_contents_delegate_android", | 513 "//components/web_contents_delegate_android", |
| 513 "//third_party/android_opengl/etc1", | 514 "//third_party/android_opengl/etc1", |
| 514 ] | 515 ] |
| 515 deps -= [ | 516 deps -= [ |
| 516 "//third_party/libaddressinput", | 517 "//third_party/libaddressinput", |
| 517 "//components/feedback", | 518 "//components/feedback", |
| 518 "//components/storage_monitor", | 519 "//components/storage_monitor", |
| 519 "//components/web_modal", | 520 "//components/web_modal", |
| 520 ] | 521 ] |
| 521 } else { | 522 } else { |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 964 ] | 965 ] |
| 965 } | 966 } |
| 966 | 967 |
| 967 if (enable_wifi_bootstrapping) { | 968 if (enable_wifi_bootstrapping) { |
| 968 sources += [ | 969 sources += [ |
| 969 "local_discovery/wifi/mock_wifi_manager.cc", | 970 "local_discovery/wifi/mock_wifi_manager.cc", |
| 970 "local_discovery/wifi/mock_wifi_manager.h", | 971 "local_discovery/wifi/mock_wifi_manager.h", |
| 971 ] | 972 ] |
| 972 } | 973 } |
| 973 } | 974 } |
| OLD | NEW |