From 155a50d00ed0cd130c4baf4e47ab7efcf2d7e838 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 29 May 2015 17:51:22 +0800 Subject: [PATCH] Revert "Link with ui_zoom in component build" This reverts commit b48bc01c8f1fc11862f96db835a5f257aa6e53aa. --- brightray/brightray.gyp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 4875710029..f59e86c588 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -82,7 +82,6 @@ ['libchromiumcontent_component', { 'link_settings': { 'libraries': [ - '<(libchromiumcontent_dir)/libui_zoom.a', # libgtk2ui is always linked statically. '<(libchromiumcontent_dir)/libgtk2ui.a', ], @@ -114,13 +113,7 @@ }, 'conditions': [ # Link with system frameworks. - ['libchromiumcontent_component', { - 'link_settings': { - 'libraries': [ - '<(libchromiumcontent_dir)/libui_zoom.a', - ], - }, - }, { + ['libchromiumcontent_component==0', { 'link_settings': { 'libraries': [ # ui_base.gypi: @@ -159,10 +152,9 @@ ['OS=="win"', { 'conditions': [ ['libchromiumcontent_component', { + # sandbox and base_static are always linked statically. 'link_settings': { 'libraries': [ - '<(libchromiumcontent_dir)/ui_zoom.lib', - # sandbox and base_static are always linked statically. '<(libchromiumcontent_dir)/base_static.lib', '<(libchromiumcontent_dir)/sandbox.lib', ],