GN build improvements, misc plus

Parameterize webrtc enabling.

Add use_seccomp_pbf flag

Add a webkit version target

Work on ui/base GN build, especially on Windows. This target is a mess (in GYP). This patch tries to make it make a bit more sense while fixing the errors I found.

Fix ui/gl target for non-Linux platform. A bunch of X11 stuff was not parameterized.

Add unscaled resources target

BUG=
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/287343006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271724 0039d316-1c4b-4281-b951-d872f2087c98

build/config/BUILD.gn

@@ -27,7 +27,6 @@ config("feature_flags") {
       "CHROMIUM_BUILD",
       "ENABLE_ONE_CLICK_SIGNIN",
       "ENABLE_REMOTING=1",
-      "ENABLE_WEBRTC=1",
       "ENABLE_CONFIGURATION_POLICY",
       "ENABLE_NOTIFICATIONS",
       "ENABLE_EGLIMAGE=1",
@@ -124,6 +123,9 @@ config("feature_flags") {
   if (use_allocator != "tcmalloc") {
     defines += [ "NO_TCMALLOC" ]
   }
+  if (enable_webrtc) {
+    defines += [ "ENABLE_WEBRTC=1" ]
+  }
 }
 
 # Debug/release ----------------------------------------------------------------

build/config/features.gni

@@ -47,3 +47,12 @@ if (is_android) {
 } else {
   enable_printing = 1
 }
+
+# The seccomp-bpf sandbox is only supported on three architectures
+# currently.
+# Do not disable seccomp_bpf anywhere without talking to
+# security@chromium.org!
+use_seccomp_bpf = (is_linux || is_android) &&
+  (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm")
+
+enable_webrtc = !is_ios

build/util/BUILD.gn

@@ -13,7 +13,7 @@
 # All you need to do is depend on this target, and then from your source code:
 #  #include "build/util/last_change.h"
 action("last_change") {
-  script = "//build/util/lastchange.py"
+  script = "lastchange.py"
 
   # Rerun the script any time this file changes.
   source_prereqs = [ "//build/util/LASTCHANGE" ]
@@ -30,3 +30,21 @@ action("last_change") {
     "--version-macro=LAST_CHANGE",
   ]
 }
+
+action("webkit_version") {
+  script = "version.py"
+
+  lastchange_file = "LASTCHANGE.blink"
+  # TODO(brettw) move from content to this directory.
+  template_file = "//content/webkit_version.h.in"
+  source_prereqs = [ lastchange_file, template_file ]
+
+  output_file = "$root_gen_dir/webkit_version.h"
+  outputs = [ output_file ]
+
+  args = [
+    "-f", rebase_path(lastchange_file, root_build_dir),
+    rebase_path(template_file, root_build_dir),
+    rebase_path(output_file, root_build_dir),
+  ]
+}

gpu/BUILD.gn

@@ -10,7 +10,7 @@
 #
 #  gpu.gyp:gles2_cmd_helper => //gpu/command_buffer/client:gles2_cmd_helper
 #
-#  gpu.gyp:gles2_c_lib => //gpu/command_buffer/client:cles2_c_lib
+#  gpu.gyp:gles2_c_lib => //gpu/command_buffer/client:gles2_c_lib
 #
 #  gpu.gyp:gles2_implementation =>
 #      //gpu_command_buffer/client:gles2_implementation

ui/base/BUILD.gn

@@ -34,8 +34,6 @@ component("ui_base") {
     "clipboard/clipboard.h",
     "clipboard/clipboard_android.cc",
     "clipboard/clipboard_android_initialization.h",
-    "clipboard/clipboard_aura.cc",
-    "clipboard/clipboard_aurax11.cc",
     "clipboard/clipboard_constants.cc",
     "clipboard/clipboard_mac.mm",
     "clipboard/clipboard_types.h",
@@ -97,12 +95,9 @@ component("ui_base") {
     "cursor/cursor_loader.h",
     "cursor/cursor_loader_win.cc",
     "cursor/cursor_loader_win.h",
-    "cursor/cursor_loader_x11.cc",
-    "cursor/cursor_loader_x11.h",
     "cursor/cursor_util.cc",
     "cursor/cursor_util.h",
     "cursor/cursor_win.cc",
-    "cursor/cursor_x11.cc",
     "cursor/cursors_aura.cc",
     "cursor/cursors_aura.h",
     "default_theme_provider.cc",
@@ -132,10 +127,6 @@ component("ui_base") {
     "dragdrop/file_info.h",
     "dragdrop/os_exchange_data.cc",
     "dragdrop/os_exchange_data.h",
-    "dragdrop/os_exchange_data_provider_aura.cc",
-    "dragdrop/os_exchange_data_provider_aura.h",
-    "dragdrop/os_exchange_data_provider_aurax11.cc",
-    "dragdrop/os_exchange_data_provider_aurax11.h",
     "dragdrop/os_exchange_data_provider_win.cc",
     "dragdrop/os_exchange_data_provider_win.h",
     "hit_test.h",
@@ -206,7 +197,6 @@ component("ui_base") {
     "touch/touch_device.cc",
     "touch/touch_device.h",
     "touch/touch_device_android.cc",
-    "touch/touch_device_aurax11.cc",
     "touch/touch_device_ozone.cc",
     "touch/touch_device_win.cc",
     "touch/touch_editing_controller.cc",
@@ -285,6 +275,7 @@ component("ui_base") {
     "//skia",
     "//third_party/icu",
     "//ui/resources",
+    "//ui/resources:unscaled_resources",
     "//ui/strings",
     "//ui/webui/resources",
     "//url",
@@ -311,9 +302,6 @@ component("ui_base") {
     sources -= [
       "cursor/cursor.cc",
       "cursor/cursor.h",
-      "cursor/cursor_loader_x11.cc",
-      "cursor/cursor_loader_x11.h",
-      "cursor/cursor_x11.cc",
       "x/selection_owner.cc",
       "x/selection_owner.h",
       "x/selection_requestor.cc",
@@ -356,26 +344,14 @@ component("ui_base") {
       "//build/config/linux:pangocairo",
     ]
   }
-  if (is_win || use_clipboard_aurax11) {
-    sources -= [
-      "clipboard/clipboard_aura.cc",
-    ]
-  } else {
-    sources -= [
-      "clipboard/clipboard_aurax11.cc",
-    ]
-  }
 
   if (is_chromeos || (use_aura && is_linux && !use_x11)) {
-    sources -= [
+    sources += [
-      "dragdrop/os_exchange_data_provider_aurax11.cc",
-      "touch/touch_device.cc",
-    ]
-  } else {
-    sources -= [
       "dragdrop/os_exchange_data_provider_aura.cc",
       "dragdrop/os_exchange_data_provider_aura.h",
-      "touch/touch_device_aurax11.cc",
+    ]
+    sources -= [
+      "touch/touch_device.cc",
     ]
   }
 
@@ -444,6 +420,24 @@ component("ui_base") {
     ]
   }
 
+  if (use_aura) {
+    if (use_x11) {
+      sources += [
+        "cursor/cursor_loader_x11.cc",
+        "cursor/cursor_loader_x11.h",
+        "cursor/cursor_x11.cc",
+        "touch/touch_device_aurax11.cc",
+      ]
+      if (!is_chromeos) {
+        # These Aura X11 files aren't used on ChromeOS.
+        sources += [
+          "dragdrop/os_exchange_data_provider_aurax11.cc",
+          "dragdrop/os_exchange_data_provider_aurax11.h",
+        ]
+      }
+    }
+  }
+
   if (!toolkit_views) {
     sources -= [
       "dragdrop/drag_drop_types.h",
@@ -492,10 +486,14 @@ component("ui_base") {
     ]
   }
 
-  if (is_android && use_aura) {
+  # Aura clipboard.
-    sources -= [
+  if (use_aura) {
-      "clipboard/clipboard_aura.cc",
+    if (use_x11) {
-    ]
+      sources += [ "clipboard/clipboard_aurax11.cc" ]
+    } else if (!is_win) {
+      # This file is used for all non-X11, non-Windows aura Builds.
+      sources += [ "clipboard/clipboard_aura.cc" ]
+    }
   }
 
   if (is_android || is_ios) {

ui/gl/BUILD.gn

@@ -40,7 +40,6 @@ component("gl") {
     "gl_context_stub_with_extensions.cc",
     "gl_context_stub_with_extensions.h",
     "gl_context_win.cc",
-    "gl_context_x11.cc",
     "gl_export.h",
     "gl_fence.cc",
     "gl_fence.h",
@@ -55,13 +54,11 @@ component("gl") {
     "gl_image_stub.cc",
     "gl_image_stub.h",
     "gl_image_win.cc",
-    "gl_image_x11.cc",
     "gl_implementation.cc",
     "gl_implementation.h",
     "gl_implementation_android.cc",
     "gl_implementation_mac.cc",
     "gl_implementation_win.cc",
-    "gl_implementation_x11.cc",
     "gl_osmesa_api_implementation.cc",
     "gl_osmesa_api_implementation.h",
     "gl_share_group.cc",
@@ -75,7 +72,6 @@ component("gl") {
     "gl_surface_stub.cc",
     "gl_surface_stub.h",
     "gl_surface_win.cc",
-    "gl_surface_x11.cc",
     "gl_surface_osmesa.cc",
     "gl_surface_osmesa.h",
     "gl_switches.cc",
@@ -149,12 +145,16 @@ component("gl") {
     sources += [
       "gl_context_glx.cc",
       "gl_context_glx.h",
+      "gl_context_x11.cc",
       "gl_glx_api_implementation.cc",
       "gl_glx_api_implementation.h",
       "gl_image_glx.cc",
       "gl_image_glx.h",
+      "gl_image_x11.cc",
+      "gl_implementation_x11.cc",
       "gl_surface_glx.cc",
       "gl_surface_glx.h",
+      "gl_surface_x11.cc",
       "gl_egl_api_implementation.cc",
       "gl_egl_api_implementation.h",
       "$gl_binding_output_dir/gl_bindings_autogen_glx.cc",

ui/resources/BUILD.gn

@@ -8,3 +8,8 @@ grit("resources") {
   output_name = "ui_resources"
   source = "ui_resources.grd"
 }
+
+grit("unscaled_resources") {
+  output_name = "ui_unscaled_resources"
+  source = "ui_unscaled_resources.grd"
+}