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 /tools | |
| 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 'tools')
| -rwxr-xr-x | tools/include_tracer.py | 4 | ||||
| -rwxr-xr-x | tools/licenses.py | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tools/include_tracer.py b/tools/include_tracer.py index df30c65..567a797 100755 --- a/tools/include_tracer.py +++ b/tools/include_tracer.py @@ -25,9 +25,7 @@ INCLUDE_PATHS = [ 'skia/ext', 'testing/gmock/include', 'testing/gtest/include', - 'third_party/GTM', 'third_party/WebKit/Source', - 'third_party/WebKit/Source/wtf', 'third_party/WebKit/Source/core', 'third_party/WebKit/Source/core/accessibility', 'third_party/WebKit/Source/core/accessibility/chromium', @@ -113,7 +111,9 @@ INCLUDE_PATHS = [ 'third_party/WebKit/Source/core/xml', 'third_party/WebKit/Source/public', 'third_party/WebKit/Source/web', + 'third_party/WebKit/Source/wtf', 'third_party/cld', + 'third_party/google_toolbox_for_mac/src', 'third_party/icu/public/common', 'third_party/icu/public/i18n', 'third_party/npapi', diff --git a/tools/licenses.py b/tools/licenses.py index e87a54d..3bf998f 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -140,12 +140,6 @@ SPECIAL_CASES = { # Absolute path here is resolved as relative to the source root. "License File": "/LICENSE.chromium_os", }, - os.path.join('third_party', 'GTM'): { - "Name": "Google Toolbox for Mac", - "URL": "http://code.google.com/p/google-toolbox-for-mac/", - "License": "Apache 2.0", - "License File": "COPYING", - }, os.path.join('third_party', 'lss'): { "Name": "linux-syscall-support", "URL": "http://code.google.com/p/linux-syscall-support/", |