diff options
| author | lukasza <lukasza@chromium.org> | 2015-12-23 18:05:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-24 02:06:53 +0000 |
| commit | 0750b7fc18b8b510f8763164fb8661c2ba6eee94 (patch) | |
| tree | 4a9ec83d40b2104db911a43210738ff335a6cc58 /remoting/remoting_host_mac.gypi | |
| parent | a7f6c2c1f7a8eefba6fefc6a7edeb35b10c146c8 (diff) | |
| download | chromium_src-0750b7fc18b8b510f8763164fb8661c2ba6eee94.zip chromium_src-0750b7fc18b8b510f8763164fb8661c2ba6eee94.tar.gz chromium_src-0750b7fc18b8b510f8763164fb8661c2ba6eee94.tar.bz2 | |
Revert of remoting: use VerifyHostPinHash() in place on IsPinValid() (patchset #6 id:100001 of https://codereview.chromium.org/1547533002/ )
Reason for revert:
Relanding still broke the build - https://build.chromium.org/p/chromium/builders/Mac/builds/10279/steps/compile/logs/stdio:
Undefined symbols for architecture i386:
"remoting::kHostConfigFileName", referenced from:
-[Me2MePreferencePane readNewConfig] in remoting_host_prefpane.me2me_preference_pane.i386.o
-[Me2MePreferencePane mismatchAlertDidEnd:returnCode:contextInfo:] in remoting_host_prefpane.me2me_preference_pane.i386.o
Original issue's description:
> remoting: use VerifyHostPinHash() in place on IsPinValid()
>
> For over a year, we have been shipping a 64-bit version of Chrome for Mac.
> So with this statement, this patch makes the switch to
> VerifyHostPinHash() function from remoting/host/pin_hash.h, fixing the
> lambroslambrou's TODO.
>
> BUG=None
> R=sergeyu@chromium.org
>
> Committed: https://crrev.com/7acd392e4018d121977e2738b6e3c59f5cf418f1
> Cr-Commit-Position: refs/heads/master@{#366762}
>
> Committed: https://crrev.com/d433493df4b98ea006e6407590cff7a7912e16df
> Cr-Commit-Position: refs/heads/master@{#366783}
TBR=sergeyu@chromium.org,tfarina@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/1541323004
Cr-Commit-Position: refs/heads/master@{#366790}
Diffstat (limited to 'remoting/remoting_host_mac.gypi')
| -rw-r--r-- | remoting/remoting_host_mac.gypi | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/remoting/remoting_host_mac.gypi b/remoting/remoting_host_mac.gypi index 258a688..dce3cf0 100644 --- a/remoting/remoting_host_mac.gypi +++ b/remoting/remoting_host_mac.gypi @@ -178,10 +178,7 @@ 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', }, 'dependencies': [ - 'remoting_base', - 'remoting_host', 'remoting_infoplist_strings', - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', ], 'defines': [ 'HOST_BUNDLE_NAME="<(host_bundle_name)"', @@ -193,7 +190,21 @@ '../third_party/jsoncpp/source/include/', '../third_party/jsoncpp/source/src/lib_json/', ], + + # These source files are included directly, instead of adding target + # dependencies, because the targets are not yet built for 64-bit on + # Mac OS X - http://crbug.com/125116. + # + # TODO(lambroslambrou): Fix this when Chrome supports building for + # Mac OS X 64-bit - http://crbug.com/128122. 'sources': [ + '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp', + '../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp', + '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', + '../third_party/modp_b64/modp_b64.cc', + 'host/constants_mac.cc', + 'host/constants_mac.h', + 'host/host_config_constants.cc', 'host/mac/me2me_preference_pane.h', 'host/mac/me2me_preference_pane.mm', 'host/mac/me2me_preference_pane_confirm_pin.h', |