| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//build/split_static_library.gni") | 9 import("//build/split_static_library.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 3466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3477 ] | 3477 ] |
| 3478 } | 3478 } |
| 3479 | 3479 |
| 3480 if (!is_chrome_branded) { | 3480 if (!is_chrome_branded) { |
| 3481 sources += [ | 3481 sources += [ |
| 3482 "search/local_files_ntp_source.cc", | 3482 "search/local_files_ntp_source.cc", |
| 3483 "search/local_files_ntp_source.h", | 3483 "search/local_files_ntp_source.h", |
| 3484 ] | 3484 ] |
| 3485 } | 3485 } |
| 3486 | 3486 |
| 3487 if (enable_vr_shell || enable_webvr) { | 3487 if (enable_webvr) { |
| 3488 if (enable_vr_shell) { | |
| 3489 defines += [ "ENABLE_VR_SHELL" ] | |
| 3490 } | |
| 3491 | |
| 3492 deps += [ "android/vr_shell:vr_common" ] | 3488 deps += [ "android/vr_shell:vr_common" ] |
| 3493 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] | 3489 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] |
| 3494 } | 3490 } |
| 3495 | 3491 |
| 3496 if (is_mac) { | 3492 if (is_mac) { |
| 3497 deps += [ | 3493 deps += [ |
| 3498 "//chrome/app_shim", | 3494 "//chrome/app_shim", |
| 3499 "//chrome/browser/apps/app_shim", | 3495 "//chrome/browser/apps/app_shim", |
| 3500 "//chrome/browser/ui/cocoa/notifications:common", | 3496 "//chrome/browser/ui/cocoa/notifications:common", |
| 3501 "//third_party/crashpad/crashpad/client:client", | 3497 "//third_party/crashpad/crashpad/client:client", |
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4526 "media/pepper_cdm_test_constants.cc", | 4522 "media/pepper_cdm_test_constants.cc", |
| 4527 "media/pepper_cdm_test_constants.h", | 4523 "media/pepper_cdm_test_constants.h", |
| 4528 ] | 4524 ] |
| 4529 } | 4525 } |
| 4530 } | 4526 } |
| 4531 | 4527 |
| 4532 service_manifest("preferences_manifest") { | 4528 service_manifest("preferences_manifest") { |
| 4533 name = "preferences" | 4529 name = "preferences" |
| 4534 source = "prefs/preferences_manifest.json" | 4530 source = "prefs/preferences_manifest.json" |
| 4535 } | 4531 } |
| OLD | NEW |