| 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 3458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3469 ] | 3469 ] |
| 3470 } | 3470 } |
| 3471 | 3471 |
| 3472 if (!is_chrome_branded) { | 3472 if (!is_chrome_branded) { |
| 3473 sources += [ | 3473 sources += [ |
| 3474 "search/local_files_ntp_source.cc", | 3474 "search/local_files_ntp_source.cc", |
| 3475 "search/local_files_ntp_source.h", | 3475 "search/local_files_ntp_source.h", |
| 3476 ] | 3476 ] |
| 3477 } | 3477 } |
| 3478 | 3478 |
| 3479 if (enable_vr_shell || enable_webvr) { | 3479 if (enable_webvr) { |
| 3480 if (enable_vr_shell) { | |
| 3481 defines += [ "ENABLE_VR_SHELL" ] | |
| 3482 } | |
| 3483 | |
| 3484 deps += [ "android/vr_shell:vr_common" ] | 3480 deps += [ "android/vr_shell:vr_common" ] |
| 3485 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] | 3481 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] |
| 3486 } | 3482 } |
| 3487 | 3483 |
| 3488 if (is_mac) { | 3484 if (is_mac) { |
| 3489 deps += [ | 3485 deps += [ |
| 3490 "//chrome/app_shim", | 3486 "//chrome/app_shim", |
| 3491 "//chrome/browser/apps/app_shim", | 3487 "//chrome/browser/apps/app_shim", |
| 3492 "//chrome/browser/ui/cocoa/notifications:common", | 3488 "//chrome/browser/ui/cocoa/notifications:common", |
| 3493 "//third_party/crashpad/crashpad/client:client", | 3489 "//third_party/crashpad/crashpad/client:client", |
| (...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4507 "media/pepper_cdm_test_constants.cc", | 4503 "media/pepper_cdm_test_constants.cc", |
| 4508 "media/pepper_cdm_test_constants.h", | 4504 "media/pepper_cdm_test_constants.h", |
| 4509 ] | 4505 ] |
| 4510 } | 4506 } |
| 4511 } | 4507 } |
| 4512 | 4508 |
| 4513 service_manifest("preferences_manifest") { | 4509 service_manifest("preferences_manifest") { |
| 4514 name = "preferences" | 4510 name = "preferences" |
| 4515 source = "prefs/preferences_manifest.json" | 4511 source = "prefs/preferences_manifest.json" |
| 4516 } | 4512 } |
| OLD | NEW |