diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 03:58:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 03:58:36 +0000 |
| commit | a023dca90dc6df662487330d8ae7fcdaa1265ae1 (patch) | |
| tree | 78bdf35f46b62f2873c9888cb1a11b5622dab6d7 /remoting | |
| parent | a48af48689ea25337faca27197ba8f7c7c83128c (diff) | |
| download | chromium_src-a023dca90dc6df662487330d8ae7fcdaa1265ae1.zip chromium_src-a023dca90dc6df662487330d8ae7fcdaa1265ae1.tar.gz chromium_src-a023dca90dc6df662487330d8ae7fcdaa1265ae1.tar.bz2 | |
Get rid of ui_cocoa_third_party_toolkits target from ui.gyp
Instead we add a gyp file in third_party/google_toolbox_for_mac to build
the sources from third_party/GTM. This is the third and last patch in
this series.
BUG=299841
TEST=None
R=mark@chromium.org,ben@chromium.org
TBR=ben
Review URL: https://codereview.chromium.org/107933006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/DEPS | 3 | ||||
| -rw-r--r-- | remoting/host/local_input_monitor_mac.mm | 2 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 15 |
3 files changed, 4 insertions, 16 deletions
diff --git a/remoting/DEPS b/remoting/DEPS index d839257..309afa5 100644 --- a/remoting/DEPS +++ b/remoting/DEPS @@ -11,8 +11,7 @@ include_rules = [ "-remoting", "+remoting/base", "+remoting/proto", - "+third_party/GTM", - "+third_party/GTM/AppKit", + "+third_party/google_toolbox_for_mac/src", "+third_party/libjingle", "+third_party/libvpx", "+third_party/libyuv", diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm index 0a639e6..1e89587 100644 --- a/remoting/host/local_input_monitor_mac.mm +++ b/remoting/host/local_input_monitor_mac.mm @@ -17,7 +17,7 @@ #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "remoting/host/client_session_control.h" -#import "third_party/GTM/AppKit/GTMCarbonEvent.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMCarbonEvent.h" #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" // Esc Key Code is 53. diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 3b6a9fb..41cdf0d 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -495,19 +495,8 @@ ], }], ['OS=="mac"', { - 'sources': [ - '../third_party/GTM/AppKit/GTMCarbonEvent.h', - '../third_party/GTM/AppKit/GTMCarbonEvent.m', - '../third_party/GTM/DebugUtils/GTMDebugSelectorValidation.h', - '../third_party/GTM/DebugUtils/GTMTypeCasting.h', - '../third_party/GTM/Foundation/GTMObjectSingleton.h', - '../third_party/GTM/GTMDefines.h', - ], - 'include_dirs': [ - '../third_party/GTM', - '../third_party/GTM/AppKit', - '../third_party/GTM/DebugUtils', - '../third_party/GTM/Foundation', + 'dependencies': [ + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', ], 'link_settings': { 'libraries': [ |