Merge pull request #444 from electron/enable_official_build

Enable official build

Jenkinsfile

@@ -24,14 +24,15 @@ pipeline {
                 }
                 withCredentials([string(credentialsId: 'libccbucket', variable: 'LIBCC_BUCKET')]) {
                   withAWS(credentials:'libccs3',region:'us-east-1') {
-                    s3Upload(includePathPattern:'libchromiumcontent.*', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/osx/${env.TARGET_ARCH}/${GIT_COMMIT}/", acl:'PublicRead')
+                    s3Upload(file:'libchromiumcontent.tar.bz2', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/osx/${env.TARGET_ARCH}/${GIT_COMMIT}/libchromiumcontent.tar.bz2", acl:'PublicRead')
                   }
                 }
+                fileOperations([fileRenameOperation(destination: 'libchromiumcontent-osx.tar.bz2', source: 'libchromiumcontent.tar.bz2')])
               }
             }
             post {
               always {
-                archive 'libchromiumcontent.*'
+                archive 'libchromiumcontent-osx.tar.bz2'
                 cleanWs()
               }
             }
@@ -57,14 +58,15 @@ pipeline {
                 }
                 withCredentials([string(credentialsId: 'libccbucket', variable: 'LIBCC_BUCKET')]) {
                   withAWS(credentials:'libccs3',region:'us-east-1') {
-                    s3Upload(includePathPattern:'libchromiumcontent-static.*', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/osx/${env.TARGET_ARCH}/${GIT_COMMIT}/", acl:'PublicRead')
+                    s3Upload(file:'libchromiumcontent-static.tar.bz2', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/osx/${env.TARGET_ARCH}/${GIT_COMMIT}/libchromiumcontent-static.tar.bz2", acl:'PublicRead')
                   }
                 }
+                fileOperations([fileRenameOperation(destination: 'libchromiumcontent-static-osx.tar.bz2', source: 'libchromiumcontent-static.tar.bz2')])
               }
             }
             post {
               always {
-                archive 'libchromiumcontent-static.*'
+                archive 'libchromiumcontent-static-osx.tar.bz2'
                 cleanWs()
               }
             }
@@ -91,14 +93,15 @@ pipeline {
               }
               withCredentials([string(credentialsId: 'libccbucket', variable: 'LIBCC_BUCKET')]) {
                 withAWS(credentials:'libccs3',region:'us-east-1') {
-                  s3Upload(includePathPattern:'libchromiumcontent.*', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/mas/${env.TARGET_ARCH}/${GIT_COMMIT}/", acl:'PublicRead')
+                  s3Upload(file:'libchromiumcontent.tar.bz2', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/mas/${env.TARGET_ARCH}/${GIT_COMMIT}/libchromiumcontent.tar.bz2", acl:'PublicRead')
                 }
               }
+              fileOperations([fileRenameOperation(destination: 'libchromiumcontent-mas.tar.bz2', source: 'libchromiumcontent.tar.bz2')])
             }
           }
           post {
             always {
-              archive 'libchromiumcontent.*'
+              archive 'libchromiumcontent-mas.tar.bz2'
               cleanWs()
             }
           }
@@ -125,14 +128,15 @@ pipeline {
               }
               withCredentials([string(credentialsId: 'libccbucket', variable: 'LIBCC_BUCKET')]) {
                 withAWS(credentials:'libccs3',region:'us-east-1') {
-                  s3Upload(includePathPattern:'libchromiumcontent-static.*', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/mas/${env.TARGET_ARCH}/${GIT_COMMIT}/", acl:'PublicRead')
+                  s3Upload(file:'libchromiumcontent-static.tar.bz2', bucket:"${LIBCC_BUCKET}", path:"libchromiumcontent/mas/${env.TARGET_ARCH}/${GIT_COMMIT}/libchromiumcontent-static.tar.bz2", acl:'PublicRead')
                 }
               }
+              fileOperations([fileRenameOperation(destination: 'libchromiumcontent-mas-static.tar.bz2', source: 'libchromiumcontent-static.tar.bz2')])
             }
           }
           post {
             always {
-              archive 'libchromiumcontent-static.*'
+              archive 'libchromiumcontent-mas-static.tar.bz2'
               cleanWs()
             }
           }

chromiumcontent/BUILD.gn

@@ -1,3 +1,5 @@
+import("//build/split_static_library.gni")
+
 group("targets") {
   deps = []
 
@@ -219,10 +221,12 @@ if (is_electron_build && !is_component_build) {
       ":angle",
       ":pdfium",
       ":webkit",
+      ":webkitcore",
       ":webkitbindings",
       ":webkitmodules",
       ":webrtc",
       ":v8",
+      ":v8base",
     ]
   }
 
@@ -322,6 +326,14 @@ if (is_electron_build && !is_component_build) {
     }
   }
 
+  static_library("webkitcore") {
+    complete_static_lib = true
+    sources = []
+    if (defined(obj_webkitcore)) {
+      sources += obj_webkitcore
+    }
+  }
+
   static_library("webkitbindings") {
     complete_static_lib = true
     sources = []
@@ -354,6 +366,18 @@ if (is_electron_build && !is_component_build) {
     }
   }
 
+  split_static_library("v8base") {
+    complete_static_lib = true
+    split_count = 1
+    sources = []
+    if (defined(obj_v8base)) {
+      sources += obj_v8base
+      if (is_win) {
+        split_count = 2
+      }
+    }
+  }
+
 } else {
 
   group("chromiumcontent") {

chromiumcontent/args/static_library.gn

@@ -1,7 +1,7 @@
 root_extra_deps = [ "//chromiumcontent:chromiumcontent" ]
 is_electron_build = true
 is_component_build = false
-is_debug = false
+is_official_build = true
 symbol_level = 2
 enable_nacl = false
 enable_widevine = true
@@ -9,6 +9,11 @@ proprietary_codecs = true
 is_component_ffmpeg = true
 ffmpeg_branding = "Chrome"
 
+# CFI is disabled for the time being, as Electron is not a monolithic binary
+# with at least one shared library component (Node) and CFI is tricky in that
+# scenario
+is_cfi = false
+
 # Always use the system provided standard library
 use_custom_libcxx = false
 

chromiumcontent/build_libs.py

@@ -264,7 +264,6 @@ with open(args.out, 'w') as out:
         "obj_webkit",
         [
             "third_party/WebKit/public",
-            "third_party/WebKit/Source/core",
             "third_party/WebKit/Source/controller",
             "third_party/WebKit/Source/platform/heap",
             "third_party/WebKit/Source/platform/blink_common",
@@ -275,6 +274,13 @@ with open(args.out, 'w') as out:
             "third_party/WebKit/Source/web",
         ])
 
+    gen_list(
+        out,
+        "obj_webkitcore",
+        [
+            "third_party/WebKit/Source/core",
+        ])
+
     gen_list(
         out,
         "obj_webkitbindings",
@@ -302,7 +308,6 @@ with open(args.out, 'w') as out:
         "obj_v8",
         [
             "v8/src/inspector",
-            "v8/v8_base",
             "v8/v8_external_snapshot",
             "v8/v8_libbase",
             "v8/v8_libplatform",
@@ -310,4 +315,11 @@ with open(args.out, 'w') as out:
             "third_party/icu",
         ])
 
+    gen_list(
+        out,
+        "obj_v8base",
+        [
+            "v8/v8_base",
+        ])
+
 open(args.stamp, 'w')

patches/001-build_gn.patch

@@ -27,6 +27,24 @@ index de3f35f124aa..eabb988c1711 100644
             invoker.static_component_type == "source_set")
      _component_mode = invoker.static_component_type
    } else if (is_android || !defined(invoker.sources)) {
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index b5d6d8fdb443..5b2e5ce93ca0 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -520,8 +520,11 @@ config("compiler") {
+       }
+     }
+ 
+-    cflags += [ "-fwhole-program-vtables" ]
+-    ldflags += [ "-fwhole-program-vtables" ]
++    # -fwhole-program-vtables doesn't work well in Electron right now, as it's
++    # not a single binary and the optimizations break interfaces used across
++    # binary boundaries.
++    # cflags += [ "-fwhole-program-vtables" ]
++    # ldflags += [ "-fwhole-program-vtables" ]
+ 
+     # Work-around for http://openradar.appspot.com/20356002
+     if (is_mac) {
 diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
 index 5e1f7fcc4d83..15723e6b7184 100644
 --- a/build/config/win/BUILD.gn