diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 15 | ||||
| -rw-r--r-- | media/media.gyp | 2 | ||||
| -rw-r--r-- | net/net.gyp | 4 | ||||
| -rw-r--r-- | skia/skia.gyp | 2 | ||||
| -rw-r--r-- | third_party/libxml/libxml.gyp | 3 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 5 |
8 files changed, 28 insertions, 11 deletions
@@ -26,7 +26,7 @@ deps = { # TODO(mark): Remove once this has moved into depot_tools. "src/tools/gyp": - "http://gyp.googlecode.com/svn/trunk@433", + "http://gyp.googlecode.com/svn/trunk@435", "src/v8": "http://v8.googlecode.com/svn/trunk@1735", diff --git a/build/common.gypi b/build/common.gypi index 1d81fb2..2c7dde2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -219,6 +219,12 @@ 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SHLINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], 'IMPLICIT_COMMAND_DEPENDENCIES': 0, + # -rpath is only used when building with shared libraries. + 'conditions': [ + [ 'library=="shared_library"', { + 'RPATH': '$LIB_DIR', + }], + ], }, 'scons_import_variables': [ 'CC', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 2005383..f71c50a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2526,11 +2526,14 @@ 'dependencies': [ 'browser', 'common', + 'renderer', 'resources', + 'views', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', + '../webkit/webkit.gyp:glue', ], 'sources': [ 'browser/visitedlink_perftest.cc', @@ -2723,18 +2726,20 @@ 'views/accessibility/accessible_wrapper.cc', 'views/accessibility/view_accessibility.cc', 'views/controls/scrollbar/bitmap_scroll_bar.cc', - 'views/controls/button/image_button.cc', 'views/controls/button/button_dropdown.cc', 'views/controls/button/checkbox.cc', - 'views/controls/menu/chrome_menu.cc', + 'views/controls/button/image_button.cc', + 'views/controls/button/menu_button.cc', 'views/controls/combo_box.cc', - 'views/focus/focus_manager.cc', - 'views/controls/table/group_table_view.cc', 'views/controls/hwnd_view.cc', 'views/controls/link.cc', + 'views/controls/menu/chrome_menu.cc', 'views/controls/menu/menu.cc', - 'views/controls/button/menu_button.cc', 'views/controls/message_box_view.cc', + 'views/controls/scroll_view.cc', + 'views/controls/table/group_table_view.cc', + 'views/focus/external_focus_tracker.cc', + 'views/focus/focus_manager.cc', 'views/controls/button/native_button.cc', 'views/controls/native_control.cc', 'views/controls/scrollbar/native_scroll_bar.cc', diff --git a/media/media.gyp b/media/media.gyp index 7f144d1..ee33bf0 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -103,6 +103,8 @@ ['OS =="linux"', { 'sources!': [ 'filters/ffmpeg_audio_decoder.cc', + 'filters/ffmpeg_demuxer.cc', + 'filters/ffmpeg_demuxer.h', 'filters/ffmpeg_glue.cc', 'filters/ffmpeg_video_decoder.cc', ], diff --git a/net/net.gyp b/net/net.gyp index 34c84762..eab929a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -18,6 +18,10 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../build/temp_gyp/v8.gyp:v8', '../sdch/sdch.gyp:sdch', + # TODO: various targets end up using + # testing::internal::AssertHelper through references here. + # Good candidate for refactoring. + '../testing/gtest.gyp:gtest', '../third_party/bzip2/bzip2.gyp:bzip2', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', diff --git a/skia/skia.gyp b/skia/skia.gyp index ae3cc55..5062420 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -571,7 +571,7 @@ 'sgl/SkTSort.h', 'sgl/SkTypeface.cpp', 'sgl/SkTypeface_fake.cpp', - #'sgl/SkUnPreMultiply.cpp', + 'sgl/SkUnPreMultiply.cpp', 'sgl/SkUtils.cpp', 'sgl/SkWriter32.cpp', 'sgl/SkXfermode.cpp', diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index b1b0117..84fb755 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -194,6 +194,7 @@ ['OS=="linux"', { 'link_settings': { 'libraries': [ + '-ldl', '-lm', ], }, @@ -211,11 +212,13 @@ ], 'dependencies': [ 'libxml', + '../icu38/icu38.gyp:icuuc', ], 'conditions': [ ['OS=="linux"', { 'link_settings': { 'libraries': [ + '-ldl', '-lm', ], }, diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 53326dd..dd52f0a 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1980,6 +1980,7 @@ '../third_party/WebKit/WebCore/page/ContextMenuClient.h', '../third_party/WebKit/WebCore/page/ContextMenuController.cpp', '../third_party/WebKit/WebCore/page/ContextMenuController.h', + '../third_party/WebKit/WebCore/page/Coordinates.cpp', '../third_party/WebKit/WebCore/page/DOMSelection.cpp', '../third_party/WebKit/WebCore/page/DOMSelection.h', '../third_party/WebKit/WebCore/page/DOMTimer.cpp', @@ -3915,7 +3916,6 @@ # compile. '../third_party/WebKit/WebCore/dom/StaticStringList.cpp', '../third_party/WebKit/WebCore/loader/icon/IconFetcher.cpp', - '../third_party/WebKit/WebCore/loader/icon/IconRecord.cpp', '../third_party/WebKit/WebCore/loader/UserStyleSheetLoader.cpp', '../third_party/WebKit/WebCore/platform/graphics/GraphicsLayer.cpp', '../third_party/WebKit/WebCore/platform/graphics/RenderLayerBacking.cpp', @@ -4287,9 +4287,6 @@ '<(INTERMEDIATE_DIR)', ], 'sources': [ - # webkit_version rule - '../third_party/WebKit/WebCore/Configurations/Version.xcconfig', - # This list contains all .h, .cc, and .mm files in glue except for # those in the test subdirectory and those with unittest in in their # names. |