Skip to content

Commit

Permalink
Move wtl from chrome/third_party to third_party/. This
Browse files Browse the repository at this point in the history
breaks dependencies on chrome from webkit, app, views
and base.

BUG=37649
TEST=compiles
Review URL: http://codereview.chromium.org/699001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41001 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tony@chromium.org committed Mar 9, 2010
1 parent 506ccef commit cd134c8
Show file tree
Hide file tree
Showing 42 changed files with 31 additions and 55,996 deletions.
2 changes: 1 addition & 1 deletion app/app_base.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
'include_dirs': [
'..',
'../chrome/third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'conditions': [
['OS=="win"', {
Expand Down
2 changes: 1 addition & 1 deletion base/base.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
},],
[ 'OS == "win"', {
'include_dirs': [
'../chrome/third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'sources!': [
'event_recorder_stubs.cc',
Expand Down
4 changes: 2 additions & 2 deletions chrome/chrome.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@
'_SCL_SECURE_NO_DEPRECATE',
],
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
}],
['enable_gpu==1', {
Expand Down Expand Up @@ -689,7 +689,7 @@
'conditions': [
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
}],
['OS=="linux" and target_arch!="arm"', {
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_browser.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -2501,7 +2501,7 @@
'_SCL_SECURE_NO_DEPRECATE',
],
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'../gears/gears.gyp:gears',
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'conditions': [
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
}],
],
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_dll.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'conditions': [
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'defines': [
'CHROME_DLL',
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_renderer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
# Windows-specific rules.
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'conditions': [
['win_use_allocator_shim==1', {
Expand Down
18 changes: 9 additions & 9 deletions chrome/chrome_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
}],
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
}],
],
Expand Down Expand Up @@ -234,7 +234,7 @@
}],
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'<(allocator_target)',
Expand Down Expand Up @@ -364,7 +364,7 @@
}],
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'crash_service', # run time dependency
Expand Down Expand Up @@ -1051,7 +1051,7 @@
'<(allocator_target)',
],
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'sources': [
'app/chrome_dll.rc',
Expand Down Expand Up @@ -1233,7 +1233,7 @@
'<@(browser_tests_sources_views_specific)'
],
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'chrome_dll_version',
Expand Down Expand Up @@ -1509,7 +1509,7 @@
'conditions': [
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'<(allocator_target)',
Expand Down Expand Up @@ -1708,7 +1708,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
],
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'chrome_dll_version',
Expand Down Expand Up @@ -1819,7 +1819,7 @@
],
'include_dirs': [
'..',
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'sources': [
'test/plugin/plugin_test.cpp',
Expand Down Expand Up @@ -1862,7 +1862,7 @@
],
'include_dirs': [
'..',
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'sources': [
'test/selenium/selenium_test.cc',
Expand Down
2 changes: 1 addition & 1 deletion chrome/nacl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
'__STDC_LIMIT_MACROS=1',
],
'include_dirs': [
'third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
},],
['OS=="linux"', {
Expand Down
2 changes: 1 addition & 1 deletion chrome/test/interactive_ui/interactive_ui_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
}], # OS=="mac"
['OS=="win"', {
'include_dirs': [
'<(DEPTH)/chrome/third_party/wtl/include',
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'<(DEPTH)/app/app.gyp:app_resources',
Expand Down
65 changes: 0 additions & 65 deletions chrome/third_party/wtl/Ms-PL.txt

This file was deleted.

14 changes: 0 additions & 14 deletions chrome/third_party/wtl/README.chromium

This file was deleted.

Loading

0 comments on commit cd134c8

Please sign in to comment.