diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 16:59:04 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 16:59:04 +0000 |
| commit | c3521621c5d892978d37f0f80d94881f15be019b (patch) | |
| tree | 6c2625542b5e885fd6cedaf5e155bb2ee40a6456 /third_party | |
| parent | a2a3e7ce17671c6c1ec93474ee9eecd7d63b3cbc (diff) | |
| download | chromium_src-c3521621c5d892978d37f0f80d94881f15be019b.zip chromium_src-c3521621c5d892978d37f0f80d94881f15be019b.tar.gz chromium_src-c3521621c5d892978d37f0f80d94881f15be019b.tar.bz2 | |
Instrumented libraries: add liboverlay-scrollbar-0.2-0.
Also, relativize the hard-coded path to liboverlay-scrollbar.so in libgtk2.0 to
make it load the instrumented version.
BUG=313751
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/305953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 9 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/libgtk2.0-0.diff | 18 |
2 files changed, 24 insertions, 3 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 1b53213..43dd8f7 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -90,6 +90,7 @@ '<(_sanitizer_type)-libgdk-pixbuf2.0-0', '<(_sanitizer_type)-libpci3', '<(_sanitizer_type)-libdbusmenu-glib4', + '<(_sanitizer_type)-liboverlay-scrollbar-0.2-0', ], 'conditions': [ ['asan==1', { @@ -486,5 +487,13 @@ 'dependencies=': [], 'includes': ['standard_instrumented_library_target.gypi'], }, + { + 'library_name': 'liboverlay-scrollbar-0.2-0', + 'extra_configure_flags': [ + '--with-gtk=2', + ], + 'dependencies=': [], + 'includes': ['standard_instrumented_library_target.gypi'], + }, ], } diff --git a/third_party/instrumented_libraries/libgtk2.0-0.diff b/third_party/instrumented_libraries/libgtk2.0-0.diff index c010535..71a0224 100644 --- a/third_party/instrumented_libraries/libgtk2.0-0.diff +++ b/third_party/instrumented_libraries/libgtk2.0-0.diff @@ -1,6 +1,18 @@ +diff -rupN ./gtk/gtkmain.c ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c +--- ./gtk/gtkmain.c 2014-05-29 19:39:07.000000000 +0400 ++++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c 2014-05-29 19:44:00.368263970 +0400 +@@ -759,7 +759,7 @@ _overlay_scrollbar_init (void) + return; + + /* default extension library to use for this release */ +- gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0"; ++ gchar *path = "liboverlay-scrollbar-0.2.so.0"; + + module = g_module_open (path, G_MODULE_BIND_LOCAL); + if (module == NULL) diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h --- ./gtk/gtkmenushell.h 2011-08-16 06:30:52.000000000 +0400 -+++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h 2014-04-17 01:05:36.276800937 +0400 ++++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h 2014-05-29 19:42:28.029449496 +0400 @@ -135,7 +135,9 @@ void _gtk_menu_shell_update_mnemonic void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell, gboolean keyboard_mode); @@ -13,8 +25,8 @@ diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h #endif /* __GTK_MENU_SHELL_H__ */ diff -rupN ./gtk/Makefile.am ../gtk+2.0-2.24.10-patched/gtk/Makefile.am ---- ./gtk/Makefile.am 2014-04-17 01:03:15.000000000 +0400 -+++ ../gtk+2.0-2.24.10-patched/gtk/Makefile.am 2014-04-17 00:23:13.950329332 +0400 +--- ./gtk/Makefile.am 2014-05-29 19:39:07.000000000 +0400 ++++ ../gtk+2.0-2.24.10-patched/gtk/Makefile.am 2014-05-29 19:42:28.029449496 +0400 @@ -1391,8 +1391,10 @@ stamp-icons: $(STOCK_ICONS) if CROSS_COMPILING gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) |