Refer to desktop sysroot of chromium-efl

Change-Id: Ic4cc6c68cb4ebca5d8fa78e1bedbfa95ad5d7fcf
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/vendor/brightray/brightray.gyp b/vendor/brightray/brightray.gyp
index b8a5843..0ab858f 100644 (file)
--- a/vendor/brightray/brightray.gyp
+++ b/vendor/brightray/brightray.gyp
@@ -39,26 +39,48 @@
       },
       'sources': [ '<@(brightray_sources)' ],
       'conditions': [
-        # Link with libraries of libchromiumcontent.
-        ['OS=="linux" and libchromiumcontent_component==0', {
-          # On Linux we have to use "--whole-archive" to force executable
-          # to include all symbols, otherwise we will have plenty of
-          # unresolved symbols errors.
+        ['use_efl==1', {
           'direct_dependent_settings': {
             'ldflags': [
+              '-Wl,-rpath=<(libchromiumcontent_shared_libraries_dir)',
               '-Wl,--whole-archive',
               '<@(libchromiumcontent_libraries)',
+#              '<!(<(echo ysys :: <@(libchromiumcontent_libraries)))',
               '-Wl,--no-whole-archive',
             ],
+            'link_settings': {
+              'libraries': [
+                '<@(libchromiumcontent_libraries)',
+                '<@(libchromiumcontent_shared_root_libraries)',
+#                '<!(<(echo <@(libchromiumcontent_libraries)))',
+              ]
+            },
           }
-        }, {  # (Release build on Linux)
-          'link_settings': {
-            'libraries': [
-              '<@(libchromiumcontent_libraries)',
-#              '<!(<(echo <@(libchromiumcontent_libraries)))',
-            ]
-          },
-        }],  # (Normal builds)
+        }, {
+          'conditions': [
+            # Link with libraries of libchromiumcontent.
+            ['OS=="linux" and libchromiumcontent_component==0', {
+              # On Linux we have to use "--whole-archive" to force executable
+              # to include all symbols, otherwise we will have plenty of
+              # unresolved symbols errors.
+              'direct_dependent_settings': {
+                'ldflags': [
+                  '-Wl,--whole-archive',
+                  '<@(libchromiumcontent_libraries)',
+                  '<!(<(echo <@(libchromiumcontent_libraries)))',
+                  '-Wl,--no-whole-archive',
+                ],
+              }
+            }, {  # (Release build on Linux)
+              'link_settings': {
+                'libraries': [
+                  '<@(libchromiumcontent_libraries)',
+                  '<!(<(echo <@(libchromiumcontent_libraries)))',
+                ]
+              },
+            }],  # (Normal builds)
+          ],
+        }],  # use_efl==1
         # Linux specific link settings.
         ['OS=="linux"', {
           'link_settings': {
@@ -91,9 +113,10 @@
             ],
           },
           'conditions': [
-            ['libchromiumcontent_component', {
+            ['libchromiumcontent_component and use_efl!=1', {
               'link_settings': {
                 'libraries': [
+                  '<!(<(pkg-config ysys3333))',
                   # Following libraries are always linked statically.
                   '<(libchromiumcontent_dir)/libgtkui.a',
                   '<(libchromiumcontent_dir)/libhttp_server.a',
@@ -138,7 +161,7 @@
               'link_settings': {
                 'libraries': [
                   # Link with ffmpeg.
-                  '<(libchromiumcontent_dir)/libffmpeg.so',
+#                  '<(libchromiumcontent_dir)/libffmpeg.so',
                   # Following libraries are required by libchromiumcontent:
                   '-lasound',
                   '-lcap',
@@ -174,6 +197,7 @@
             ['libchromiumcontent_component', {
               'link_settings': {
                 'libraries': [
+                  '<!(<(pkg-config ysys3333))',
                   # Following libraries are always linked statically.
                   '<(libchromiumcontent_dir)/libhttp_server.a',
                   '<(libchromiumcontent_dir)/libdesktop_capture.a',

diff --git a/vendor/brightray/vendor/libchromiumcontent/tools/generate_filenames_gypi.py b/vendor/brightray/vendor/libchromiumcontent/tools/generate_filenames_gypi.py
index 9cc5861..9db8a7a 100755 (executable)
--- a/vendor/brightray/vendor/libchromiumcontent/tools/generate_filenames_gypi.py
+++ b/vendor/brightray/vendor/libchromiumcontent/tools/generate_filenames_gypi.py
@@ -71,6 +71,7 @@ GYPI_TEMPLATE = """\
     'libchromiumcontent_shared_libraries_dir': %(shared_libraries_dir)s,
     'libchromiumcontent_static_libraries_dir': %(static_libraries_dir)s,
     'libchromiumcontent_shared_libraries': %(shared_libraries)s,
+    'libchromiumcontent_shared_root_libraries': %(shared_root_libraries)s,
     'libchromiumcontent_shared_v8_libraries': %(shared_v8_libraries)s,
     'libchromiumcontent_static_libraries': %(static_libraries)s,
     'libchromiumcontent_static_v8_libraries': %(static_v8_libraries)s,
@@ -80,8 +81,11 @@ GYPI_TEMPLATE = """\
 
 
 def main(target_file, code_dir, shared_dir, static_dir):
+  print "YSYS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", shared_dir
   (shared_libraries, shared_v8_libraries) = searh_files(
       shared_dir, SHARED_LIBRARY_SUFFIX, EXCLUDE_SHARED_LIBRARIES)
+  (shared_root_libraries, shared_v8_libraries) = searh_files(
+      os.path.join(shared_dir, 'Dependencies/Root/lib64'), SHARED_LIBRARY_SUFFIX, EXCLUDE_SHARED_LIBRARIES)
   (static_libraries, static_v8_libraries) = searh_files(
       static_dir, STATIC_LIBRARY_SUFFIX, EXCLUDE_STATIC_LIBRARIES)
   content = GYPI_TEMPLATE % {
@@ -89,6 +93,7 @@ def main(target_file, code_dir, shared_dir, static_dir):
     'shared_libraries_dir': repr(os.path.abspath(shared_dir)),
     'static_libraries_dir': repr(os.path.abspath(static_dir)),
     'shared_libraries': shared_libraries,
+    'shared_root_libraries': shared_root_libraries,
     'shared_v8_libraries': shared_v8_libraries,
     'static_libraries': static_libraries,
     'static_v8_libraries': static_v8_libraries,