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

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

Issue 321423002: Drop NaCl dependencies on platforms where disable_nacl=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/all_messages.h » ('j') | 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("//tools/grit/grit_rule.gni") 5 import("//tools/grit/grit_rule.gni")
6 6
7 gypi_values = exec_script( 7 gypi_values = exec_script(
8 "//build/gypi_to_gn.py", 8 "//build/gypi_to_gn.py",
9 [ rebase_path("../chrome_common.gypi") ], 9 [ rebase_path("../chrome_common.gypi") ],
10 "scope", 10 "scope",
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 "//components/autofill/core/common", 71 "//components/autofill/core/common",
72 "//components/translate/content/common", 72 "//components/translate/content/common",
73 "//extensions/common/api", 73 "//extensions/common/api",
74 "//ipc", 74 "//ipc",
75 "//third_party/adobe/flash:flapper_version_h", 75 "//third_party/adobe/flash:flapper_version_h",
76 "//third_party/re2", 76 "//third_party/re2",
77 "//third_party/widevine/cdm:version_h", 77 "//third_party/widevine/cdm:version_h",
78 #'<(DEPTH)/components/components.gyp:password_manager_core_common', TODO( GYP) 78 #'<(DEPTH)/components/components.gyp:password_manager_core_common', TODO( GYP)
79 #'<(DEPTH)/components/components.gyp:signin_core_common', TODO(GYP) 79 #'<(DEPTH)/components/components.gyp:signin_core_common', TODO(GYP)
80 #'<(DEPTH)/components/nacl.gyp:nacl_common', TODO(GYP) 80 #'<(DEPTH)/components/nacl.gyp:nacl_common', TODO(GYP)
81 #'<(DEPTH)/extensions/common/api/api.gyp:extensions_api', TODO(GYP)
81 #'<(DEPTH)/extensions/extensions.gyp:extensions_common', TODO(GYP) 82 #'<(DEPTH)/extensions/extensions.gyp:extensions_common', TODO(GYP)
82 ] 83 ]
83 } 84 }
84 85
86 if (enable_nacl) {
87 deps += [
88 #'<(DEPTH)/components/nacl.gyp:nacl_common', TODO(GYP)
89 ]
90 sources += [
91 "extensions/manifest_handlers/nacl_modules_handler.cc",
92 "extensions/manifest_handlers/nacl_modules_handler.h",
93 ]
94 }
95
85 if (safe_browsing_mode == 1) { 96 if (safe_browsing_mode == 1) {
86 defines += [ "FULL_SAFE_BROWSING" ] 97 defines += [ "FULL_SAFE_BROWSING" ]
87 sources += rebase_path( 98 sources += rebase_path(
88 gypi_values.chrome_common_full_safe_browsing_sources, 99 gypi_values.chrome_common_full_safe_browsing_sources,
89 ".", "//chrome") 100 ".", "//chrome")
90 } 101 }
91 if (safe_browsing_mode == 2) { 102 if (safe_browsing_mode == 2) {
92 defines += [ "MOBILE_SAFE_BROWSING" ] 103 defines += [ "MOBILE_SAFE_BROWSING" ]
93 } 104 }
94 } 105 }
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 "pref_names.cc", 167 "pref_names.cc",
157 "pref_names.h", 168 "pref_names.h",
158 "widevine_cdm_constants.cc", 169 "widevine_cdm_constants.cc",
159 "widevine_cdm_constants.h", 170 "widevine_cdm_constants.h",
160 ] 171 ]
161 172
162 deps = [ 173 deps = [
163 "//base", 174 "//base",
164 "//base/third_party/dynamic_annotations", 175 "//base/third_party/dynamic_annotations",
165 "//third_party/widevine/cdm:version_h", 176 "//third_party/widevine/cdm:version_h",
166 # TODO(GYP) 177 #'../components/components.gyp:bookmarks_common', TODO(GYP)
167 #'../components/components.gyp:bookmarks_common',
168 #'../components/nacl.gyp:nacl_switches',
169 ] 178 ]
179
180 if (enable_nacl) {
181 deps += [
182 #'../components/nacl.gyp:nacl_switches', TODO(GYP)
183 ]
184 }
170 } 185 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/all_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698