Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: chrome/utility/BUILD.gn

Issue 854503004: Fix some files in chrome directory for Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build on Linux and ChromeOS. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« chrome/browser/metro_utils/BUILD.gn ('K') | « chrome/test/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 7
8 gypi_values = exec_script("//build/gypi_to_gn.py", 8 gypi_values = exec_script("//build/gypi_to_gn.py",
9 [ rebase_path("../chrome_utility.gypi") ], 9 [ rebase_path("../chrome_utility.gypi") ],
10 "scope", 10 "scope",
(...skipping 21 matching lines...) Expand all
32 32
33 if (!is_android) { 33 if (!is_android) {
34 sources += 34 sources +=
35 rebase_path(gypi_values.chrome_utility_importer_sources, ".", "..") 35 rebase_path(gypi_values.chrome_utility_importer_sources, ".", "..")
36 } 36 }
37 37
38 if (enable_extensions) { 38 if (enable_extensions) {
39 deps += [ 39 deps += [
40 "//chrome/common/extensions/api", 40 "//chrome/common/extensions/api",
41 "//extensions/utility", 41 "//extensions/utility",
42
43 #"//third_party/libexif", TODO(GYP)
44 ] 42 ]
45 43
46 public_deps += [ "//chrome/common/extensions/api" ] 44 public_deps += [ "//chrome/common/extensions/api" ]
47 45
48 sources += 46 sources +=
49 rebase_path(gypi_values.chrome_utility_extensions_sources, ".", "..") 47 rebase_path(gypi_values.chrome_utility_extensions_sources, ".", "..")
50 sources += 48 sources +=
51 rebase_path(gypi_values.chrome_utility_shared_media_sources, ".", "..") 49 rebase_path(gypi_values.chrome_utility_shared_media_sources, ".", "..")
52 50
53 if (is_win || is_mac) { 51 if (is_win || is_mac) {
54 sources += 52 sources +=
55 rebase_path(gypi_values.chrome_utility_win_mac_media_gallery_sources, 53 rebase_path(gypi_values.chrome_utility_win_mac_media_gallery_sources,
56 ".", 54 ".",
57 "..") 55 "..")
58 deps += [ "//components/wifi" ] 56 deps += [ "//components/wifi" ]
59 } else { 57 } else {
60 sources += [ "image_writer/image_writer_stub.cc" ] 58 sources += [ "image_writer/image_writer_stub.cc" ]
61 } 59 }
62 60
63 if (is_mac) { 61 if (is_mac) {
64 sources += 62 sources +=
65 rebase_path(gypi_values.chrome_utility_mac_media_gallery_sources, 63 rebase_path(gypi_values.chrome_utility_mac_media_gallery_sources,
66 ".", 64 ".",
67 "..") 65 "..")
68 } 66 }
67
68 # Linux should use system libexif
69 if (!is_linux) {
70 # TODO(thestig): Properly support building on Linux and ChromeOS.
Slava Chigrin 2015/01/21 10:35:35 In https://codereview.chromium.org/809343008#msg6
71 deps += [ "//third_party/libexif" ]
72 }
69 } 73 }
70 74
71 if (use_openssl) { 75 if (use_openssl) {
72 if (!is_win && !is_mac && !is_android) { 76 if (!is_win && !is_mac && !is_android) {
73 sources -= [ "importer/nss_decryptor.cc" ] 77 sources -= [ "importer/nss_decryptor.cc" ]
74 } 78 }
75 } else { # !use_openssl 79 } else { # !use_openssl
76 if (!is_win && !is_mac) { 80 if (!is_win && !is_mac) {
77 sources += [ 81 sources += [
78 "importer/nss_decryptor_system_nss.cc", 82 "importer/nss_decryptor_system_nss.cc",
(...skipping 17 matching lines...) Expand all
96 sources -= [ 100 sources -= [
97 "local_discovery/service_discovery_message_handler.cc", 101 "local_discovery/service_discovery_message_handler.cc",
98 "local_discovery/service_discovery_message_handler.h", 102 "local_discovery/service_discovery_message_handler.h",
99 ] 103 ]
100 } 104 }
101 105
102 if (safe_browsing_mode == 1) { 106 if (safe_browsing_mode == 1) {
103 defines += [ "FULL_SAFE_BROWSING" ] 107 defines += [ "FULL_SAFE_BROWSING" ]
104 } 108 }
105 } 109 }
OLDNEW
« chrome/browser/metro_utils/BUILD.gn ('K') | « chrome/test/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698