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

Side by Side Diff: remoting/remoting_host_mac.gypi

Issue 1543303002: Revert of remoting: use VerifyHostPinHash() in place on IsPinValid() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « remoting/host/mac/me2me_preference_pane.mm ('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 { 5 {
6 'variables': { 6 'variables': {
7 'remoting_host_installer_mac_roots': [ 7 'remoting_host_installer_mac_roots': [
8 'host/installer/mac/', 8 'host/installer/mac/',
9 '<(DEPTH)/chrome/installer/mac/', 9 '<(DEPTH)/chrome/installer/mac/',
10 ], 10 ],
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 'target_name': 'remoting_host_prefpane', 171 'target_name': 'remoting_host_prefpane',
172 'type': 'loadable_module', 172 'type': 'loadable_module',
173 'mac_bundle': 1, 173 'mac_bundle': 1,
174 'product_extension': 'prefPane', 174 'product_extension': 'prefPane',
175 'variables': { 175 'variables': {
176 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_ PREFPANE_BUNDLE_ID@")', 176 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_ PREFPANE_BUNDLE_ID@")',
177 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")', 177 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
178 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_PREFPANE_BUNDLE_NAME@")', 178 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
179 }, 179 },
180 'dependencies': [ 180 'dependencies': [
181 'remoting_base',
182 'remoting_host',
183 'remoting_infoplist_strings', 181 'remoting_infoplist_strings',
184 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
185 ], 182 ],
186 'defines': [ 183 'defines': [
187 'HOST_BUNDLE_NAME="<(host_bundle_name)"', 184 'HOST_BUNDLE_NAME="<(host_bundle_name)"',
188 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', 185 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
189 'JSON_USE_EXCEPTION=0', 186 'JSON_USE_EXCEPTION=0',
190 ], 187 ],
191 'include_dirs': [ 188 'include_dirs': [
192 '../third_party/jsoncpp/overrides/include/', 189 '../third_party/jsoncpp/overrides/include/',
193 '../third_party/jsoncpp/source/include/', 190 '../third_party/jsoncpp/source/include/',
194 '../third_party/jsoncpp/source/src/lib_json/', 191 '../third_party/jsoncpp/source/src/lib_json/',
195 ], 192 ],
193
194 # These source files are included directly, instead of adding target
195 # dependencies, because the targets are not yet built for 64-bit on
196 # Mac OS X - http://crbug.com/125116.
197 #
198 # TODO(lambroslambrou): Fix this when Chrome supports building for
199 # Mac OS X 64-bit - http://crbug.com/128122.
196 'sources': [ 200 'sources': [
201 '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
202 '../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp',
203 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
204 '../third_party/modp_b64/modp_b64.cc',
205 'host/constants_mac.cc',
206 'host/constants_mac.h',
207 'host/host_config_constants.cc',
197 'host/mac/me2me_preference_pane.h', 208 'host/mac/me2me_preference_pane.h',
198 'host/mac/me2me_preference_pane.mm', 209 'host/mac/me2me_preference_pane.mm',
199 'host/mac/me2me_preference_pane_confirm_pin.h', 210 'host/mac/me2me_preference_pane_confirm_pin.h',
200 'host/mac/me2me_preference_pane_confirm_pin.mm', 211 'host/mac/me2me_preference_pane_confirm_pin.mm',
201 'host/mac/me2me_preference_pane_disable.h', 212 'host/mac/me2me_preference_pane_disable.h',
202 'host/mac/me2me_preference_pane_disable.mm', 213 'host/mac/me2me_preference_pane_disable.mm',
203 ], 214 ],
204 'link_settings': { 215 'link_settings': {
205 'libraries': [ 216 'libraries': [
206 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', 217 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
(...skipping 29 matching lines...) Expand all
236 'variables': { 247 'variables': {
237 # A real .dSYM is needed for dump_syms to operate on. 248 # A real .dSYM is needed for dump_syms to operate on.
238 'mac_real_dsym': 1, 249 'mac_real_dsym': 1,
239 }, 250 },
240 }], # 'mac_breakpad==1' 251 }], # 'mac_breakpad==1'
241 ], # conditions 252 ], # conditions
242 }, # end of target 'remoting_host_prefpane' 253 }, # end of target 'remoting_host_prefpane'
243 ], # end of 'targets' 254 ], # end of 'targets'
244 255
245 } 256 }
OLDNEW
« no previous file with comments | « remoting/host/mac/me2me_preference_pane.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698