Issue 4907 - Update v8 to 5.7.278 in libadblockplus

common.gypi

Index: common.gypi
diff --git a/common.gypi b/common.gypi
index 4961dc4e10ef0f675b9ba86bf965fc09150bf35c..d427766a38b5b8832b5d47b28554ab12f339318d 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1,24 +1,20 @@
 {
   'variables': {
+    'component%': 'static_library',
     'visibility%': 'hidden',
     'library%': 'static_library',
-    'component%': '',
-    'want_separate_host_toolset': 0,
-    'v8_optimized_debug': 0,
-    'v8_enable_i18n_support': 0,
   },
 
   'conditions': [
     ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
        or OS=="netbsd" or OS=="android"', {
       'target_defaults': {
+        'cflags': [ '-pthread' ],
         # V8 headers cause a build error on recent gcc.
         # Adding -fpermissive to solve this.
         # See https://issues.adblockplus.org/ticket/4950
         # We might be able to do without after upgrading V8.

[Eric, 2017/05/30 17:31:40]

We're upgrading v8 now. Is this comment still relevant?

[sergei, 2017/05/31 12:47:11]

As far as I remember '-fpermissive' was not needed in my environment, so I would
propose to keep the comment as the reminder to check it later.

-        'cflags': [ '-Wall', '-W', '-Wno-unused-parameter',
-                    '-Wnon-virtual-dtor', '-pthread', '-fno-rtti',
-                    '-pedantic', '-std=c++0x', '-fexceptions', '-fpermissive' ],
+        'cflags_cc': [ '-fno-rtti', '-std=c++11', '-fexceptions', '-fpermissive' ],

[hub, 2017/05/30 15:48:03]

we can look at that after, but would it build without -fpermissive?

[sergei, 2017/05/31 12:47:11]

Could you check it after landing of the change?

         'cflags!': [ '-Werror', ],
         'ldflags': [ '-pthread', ],
       },
@@ -27,29 +23,33 @@
       'xcode_settings': {
         'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
         'CLANG_CXX_LIBRARY': 'libc++',
-        'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'],
       },
     }],
-    ['OS=="android"', {
+  ],
+  'target_conditions': [
+    ['OS=="android" and not "host" in toolsets', {
       'target_defaults': {
         'cflags!': [
-          '-pthread',  # Not supported by Android toolchain.
+          '-pthread',  # Not fully supported by Android toolchain. Built-in suport of major functions, no need to link with it.
         ],
         'ldflags!': [
-          '-pthread',  # Not supported by Android toolchain.
+          '-llog'
+          '-pthread',  # Not fully supported by Android toolchain. Built-in suport of major functions, no need to link with it.
         ],
       },
     }],
   ],
 
   'target_defaults': {
+    'configurations': {
+      'Debug': {},
+      'Release': {}
+    },
     'msvs_cygwin_shell': 0,
-    'target_conditions': [[
-      'OS=="mac" and _type=="executable"', {
-        'xcode_settings': {
-          'OTHER_LDFLAGS': ['-stdlib=libc++'],
-        },
-      }
-    ]],
+    'target_conditions': [
+      ['_type=="static_library"', {
+        'standalone_static_library': 1
+      }]
+    ]
   }
 }