Set libraries' path according to libchromiumcontent_component variable

brightray/brightray.gyp

@@ -8,22 +8,22 @@
       'type': 'static_library',
       'include_dirs': [
         '.',
-        '<(libchromiumcontent_include_dir)',
+        '<(libchromiumcontent_src_dir)',
-        '<(libchromiumcontent_include_dir)/skia/config',
+        '<(libchromiumcontent_src_dir)/skia/config',
-        '<(libchromiumcontent_include_dir)/third_party/skia/include/core',
+        '<(libchromiumcontent_src_dir)/third_party/skia/include/core',
-        '<(libchromiumcontent_include_dir)/third_party/WebKit',
+        '<(libchromiumcontent_src_dir)/third_party/WebKit',
-        '<(libchromiumcontent_library_dir)/gen',
+        '<(libchromiumcontent_dir)/gen',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '.',
           '..',
-          '<(libchromiumcontent_include_dir)',
+          '<(libchromiumcontent_src_dir)',
-          '<(libchromiumcontent_include_dir)/skia/config',
+          '<(libchromiumcontent_src_dir)/skia/config',
-          '<(libchromiumcontent_include_dir)/third_party/skia/include/core',
+          '<(libchromiumcontent_src_dir)/third_party/skia/include/core',
-          '<(libchromiumcontent_include_dir)/third_party/icu/source/common',
+          '<(libchromiumcontent_src_dir)/third_party/icu/source/common',
-          '<(libchromiumcontent_include_dir)/third_party/WebKit',
+          '<(libchromiumcontent_src_dir)/third_party/WebKit',
-          '<(libchromiumcontent_library_dir)/gen',
+          '<(libchromiumcontent_dir)/gen',
         ],
       },
       'sources': [
@@ -92,12 +92,10 @@
         'common/main_delegate.h',
         'common/main_delegate_mac.mm',
       ],
+      'link_settings': {
+        'libraries': [ '<@(libchromiumcontent_libraries)' ]
+      },
       'conditions': [
-        ['libchromiumcontent_component_build', {
-          'link_settings': {
-            'libraries': [ '<@(libchromiumcontent_shared_libraries)' ]
-          },
-        }],
         ['OS=="linux"', {
           'cflags_cc': [
             '-Wno-deprecated-register',
@@ -108,7 +106,7 @@
               '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
             ],
             'libraries': [
-              '<(libchromiumcontent_library_dir)/libchromiumviews.a',
+              '<(libchromiumcontent_dir)/libchromiumviews.a',
               '-lpthread',
               '<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
             ],
@@ -124,10 +122,10 @@
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
-              '<(libchromiumcontent_library_dir)/base_static.lib',
+              '<(libchromiumcontent_dir)/base_static.lib',
-              '<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
+              '<(libchromiumcontent_dir)/chromiumcontent.dll.lib',
-              '<(libchromiumcontent_library_dir)/chromiumviews.lib',
+              '<(libchromiumcontent_dir)/chromiumviews.lib',
-              '<(libchromiumcontent_library_dir)/sandbox_static.lib',
+              '<(libchromiumcontent_dir)/sandbox_static.lib',
             ],
           },
         }],

brightray/brightray.gypi

@@ -3,17 +3,24 @@
     'vendor/download/libchromiumcontent/filenames.gypi',
   ],
   'variables': {
-    'libchromiumcontent_library_dir': '<(libchromiumcontent_dir)/Release',
+    'libchromiumcontent_src_dir%': '<(libchromiumcontent_root_dir)/src',
-    'libchromiumcontent_include_dir': '<(libchromiumcontent_dir)/src',
+    'libchromiumcontent_component%': 1,
-    'libchromiumcontent_resources_dir': '<(libchromiumcontent_library_dir)',
+    'conditions': [
-    'libchromiumcontent_src_dir': '<(libchromiumcontent_dir)/src',
+      # The "libchromiumcontent_component" is defined when calling "gyp".
+      ['libchromiumcontent_component', {
+        'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/shared_library',
+        'libchromiumcontent_libraries%': '<(libchromiumcontent_shared_libraries)',
+        'libchromiumcontent_shared_libraries': [],
+      }, {
+        'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/static_library',
+        'libchromiumcontent_libraries%': '<(libchromiumcontent_static_libraries)',
+        'libchromiumcontent_static_libraries': [],
+      }],
+    ],
 
     'mac_deployment_target%': '10.8',
     'mac_sdkroot%': 'macosx',
 
-    # Component build.
-    'libchromiumcontent_component_build%': 1,
-
     # Build with clang under Linux.
     'linux_clang%': 1,
 
@@ -59,6 +66,10 @@
       ],
     },
     'configurations': {
+      # The "Debug" and "Release" configurations are not actually used.
+      'Debug': {},
+      'Release': {},
+
       'Common_Base': {
         'abstract': 1,
         'defines': [
@@ -109,91 +120,90 @@
           }],
         ],
       },
-      'Debug': {
+      'conditions': [
-        'inherit_from': [
+        ['libchromiumcontent_component', {
-          'Common_Base',
+          'RealDebug': {
-        ],
+            'inherit_from': [
-        'variables': {
+              'Common_Base',
-          'libchromiumcontent_component_build': 1,
-        },
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'Optimization': '<(win_debug_Optimization)',
-            'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)',
-            # We use Release to match the version of chromiumcontent.dll we
-            # link against.
-            'RuntimeLibrary': '<(win_release_RuntimeLibrary)',
-            'conditions': [
-              # According to MSVS, InlineFunctionExpansion=0 means
-              # "default inlining", not "/Ob0".
-              # Thus, we have to handle InlineFunctionExpansion==0 separately.
-              ['win_debug_InlineFunctionExpansion==0', {
-                'AdditionalOptions': ['/Ob0'],
-              }],
-              ['win_debug_InlineFunctionExpansion!=""', {
-                'InlineFunctionExpansion':
-                  '<(win_debug_InlineFunctionExpansion)',
-              }],
-              # if win_debug_OmitFramePointers is blank, leave as default
-              ['win_debug_OmitFramePointers==1', {
-                'OmitFramePointers': 'true',
-              }],
-              ['win_debug_OmitFramePointers==0', {
-                'OmitFramePointers': 'false',
-                # The above is not sufficient (http://crbug.com/106711): it
-                # simply eliminates an explicit "/Oy", but both /O2 and /Ox
-                # perform FPO regardless, so we must explicitly disable.
-                # We still want the false setting above to avoid having
-                # "/Oy /Oy-" and warnings about overriding.
-                'AdditionalOptions': ['/Oy-'],
-              }],
             ],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'Optimization': '<(win_debug_Optimization)',
+                'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)',
+                # We use Release to match the version of chromiumcontent.dll we
+                # link against.
+                'RuntimeLibrary': '<(win_release_RuntimeLibrary)',
+                'conditions': [
+                  # According to MSVS, InlineFunctionExpansion=0 means
+                  # "default inlining", not "/Ob0".
+                  # Thus, we have to handle InlineFunctionExpansion==0 separately.
+                  ['win_debug_InlineFunctionExpansion==0', {
+                    'AdditionalOptions': ['/Ob0'],
+                  }],
+                  ['win_debug_InlineFunctionExpansion!=""', {
+                    'InlineFunctionExpansion':
+                      '<(win_debug_InlineFunctionExpansion)',
+                  }],
+                  # if win_debug_OmitFramePointers is blank, leave as default
+                  ['win_debug_OmitFramePointers==1', {
+                    'OmitFramePointers': 'true',
+                  }],
+                  ['win_debug_OmitFramePointers==0', {
+                    'OmitFramePointers': 'false',
+                    # The above is not sufficient (http://crbug.com/106711): it
+                    # simply eliminates an explicit "/Oy", but both /O2 and /Ox
+                    # perform FPO regardless, so we must explicitly disable.
+                    # We still want the false setting above to avoid having
+                    # "/Oy /Oy-" and warnings about overriding.
+                    'AdditionalOptions': ['/Oy-'],
+                  }],
+                ],
+              },
+            },
+            'xcode_settings': {
+              'COPY_PHASE_STRIP': 'NO',
+              'GCC_OPTIMIZATION_LEVEL': '0',
+            },
           },
-        },
+        }, {
-        'xcode_settings': {
+          'RealRelease': {
-          'COPY_PHASE_STRIP': 'NO',
+            'inherit_from': [
-          'GCC_OPTIMIZATION_LEVEL': '0',
+              'Common_Base',
-        },
-      },
-      'Release': {
-        'inherit_from': [
-          'Common_Base',
-        ],
-        'variables': {
-          'libchromiumcontent_component_build': 0,
-        },
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'Optimization': '<(win_release_Optimization)',
-            'RuntimeLibrary': '<(win_release_RuntimeLibrary)',
-            'conditions': [
-              # According to MSVS, InlineFunctionExpansion=0 means
-              # "default inlining", not "/Ob0".
-              # Thus, we have to handle InlineFunctionExpansion==0 separately.
-              ['win_release_InlineFunctionExpansion==0', {
-                'AdditionalOptions': ['/Ob0'],
-              }],
-              ['win_release_InlineFunctionExpansion!=""', {
-                'InlineFunctionExpansion':
-                  '<(win_release_InlineFunctionExpansion)',
-              }],
-              # if win_release_OmitFramePointers is blank, leave as default
-              ['win_release_OmitFramePointers==1', {
-                'OmitFramePointers': 'true',
-              }],
-              ['win_release_OmitFramePointers==0', {
-                'OmitFramePointers': 'false',
-                # The above is not sufficient (http://crbug.com/106711): it
-                # simply eliminates an explicit "/Oy", but both /O2 and /Ox
-                # perform FPO regardless, so we must explicitly disable.
-                # We still want the false setting above to avoid having
-                # "/Oy /Oy-" and warnings about overriding.
-                'AdditionalOptions': ['/Oy-'],
-              }],
             ],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'Optimization': '<(win_release_Optimization)',
+                'RuntimeLibrary': '<(win_release_RuntimeLibrary)',
+                'conditions': [
+                  # According to MSVS, InlineFunctionExpansion=0 means
+                  # "default inlining", not "/Ob0".
+                  # Thus, we have to handle InlineFunctionExpansion==0 separately.
+                  ['win_release_InlineFunctionExpansion==0', {
+                    'AdditionalOptions': ['/Ob0'],
+                  }],
+                  ['win_release_InlineFunctionExpansion!=""', {
+                    'InlineFunctionExpansion':
+                      '<(win_release_InlineFunctionExpansion)',
+                  }],
+                  # if win_release_OmitFramePointers is blank, leave as default
+                  ['win_release_OmitFramePointers==1', {
+                    'OmitFramePointers': 'true',
+                  }],
+                  ['win_release_OmitFramePointers==0', {
+                    'OmitFramePointers': 'false',
+                    # The above is not sufficient (http://crbug.com/106711): it
+                    # simply eliminates an explicit "/Oy", but both /O2 and /Ox
+                    # perform FPO regardless, so we must explicitly disable.
+                    # We still want the false setting above to avoid having
+                    # "/Oy /Oy-" and warnings about overriding.
+                    'AdditionalOptions': ['/Oy-'],
+                  }],
+                ],
+              },
+            },
           },
-        },
+        }],
-      },
+      ],
     },
     'conditions': [
       ['OS!="mac"', {
@@ -242,7 +252,7 @@
     ['OS=="win"', {
       'target_defaults': {
         'include_dirs': [
-          '<(libchromiumcontent_include_dir)/third_party/wtl/include',
+          '<(libchromiumcontent_src_dir)/third_party/wtl/include',
         ],
         'defines': [
           '_WIN32_WINNT=0x0602',

brightray/vendor/libchromiumcontent

@@ -1 +1 @@
-Subproject commit 6b2945f386b1dae68b2b02ad7fc971f99a2f800b
+Subproject commit cbc562c7a9c6a2a56f3a6ba08652f5e475898d48