Minor additions to GN build, comment mojo bindings.

This adds comments for the converted mojo targets listing where the GN versions were. I went to implement them and I found I already did them, but couldn't find them.

This adds some protobuf builds also used by content/browser, as well as a Windows warning fix for the protobuf compiler.

R=yzshen@chromium.org

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

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

BUILD.gn

@@ -37,6 +37,8 @@ group("root") {
     "//content/public/child",
     "//content/public/common",
     "//content/public/renderer",
+    "//content/browser/service_worker:database_proto",
+    "//content/browser/speech/proto",
     "//crypto",
     "//extensions/common/api:extensions_api",
     "//dbus",

content/browser/BUILD.gn

@@ -36,8 +36,14 @@ source_set("browser") {
     "//cc",
     "//content:resources",
     "//content/browser/devtools:resources",
+    "//content/browser/service_worker:database_proto",
+    "//content/browser/speech/proto",
+    "//content/common:mojo_bindings",
     "//crypto",
     "//google_apis",
+    "//mojo/public/cpp/bindings",
+    "//mojo/public/interfaces/service_provider:service_provider",
+    "//mojo/public/js/bindings",
     "//net",
     "//net:http_server",
     "//skia",
@@ -63,13 +69,6 @@ source_set("browser") {
     "//webkit/common",
     "//webkit/common:storage",
     # TODO(GYP)
-    #'browser/service_worker/service_worker_proto.gyp:database_proto',
-    #'browser/speech/proto/speech_proto.gyp:speech_proto',
-    #'browser/devtools/devtools_resources.gyp:devtools_resources',
-    #'content_common_mojo_bindings',
-    #'../mojo/mojo.gyp:mojo_cpp_bindings',
-    #'../mojo/mojo.gyp:mojo_js_bindings',
-    #'../mojo/mojo.gyp:mojo_service_provider_bindings',
     #'../third_party/angle/src/build_angle.gyp:commit_id',
   ]
 

content/browser/service_worker/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("database_proto") {
+  sources = [
+    "service_worker_database.proto",
+  ]
+}
+

content/browser/service_worker/service_worker_proto.gyp

 {
   'targets': [
     {
+      # GN version: //content/browser/service_worker:database_proto
       'target_name': 'database_proto',
       'type': 'static_library',
       'sources': [

content/browser/speech/proto/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("proto") {
+  sources = [
+    "google_streaming_api.proto",
+  ]
+}

content/browser/speech/proto/speech_proto.gyp

@@ -4,7 +4,9 @@
 
 {
   'targets': [
-    {'target_name': 'speech_proto',
+    {
+     # GN version: //content/browser/speech/proto:proto
+     'target_name': 'speech_proto',
      'type': 'static_library',
      'sources': [
         'google_streaming_api.proto',

mojo/mojo_public.gypi

@@ -220,6 +220,7 @@
       ],
     },
     {
+      # GN version: //mojo/public/cpp/bindings
       'target_name': 'mojo_cpp_bindings',
       'type': 'static_library',
       'include_dirs': [
@@ -278,6 +279,7 @@
       ],
     },
     {
+      # GN version: //mojo/public/js/bindings
       'target_name': 'mojo_js_bindings',
       'type': 'static_library',
       'include_dirs': [
@@ -352,6 +354,7 @@
       ],
     },
     {
+      # GN version: //mojo/public/interfaces/service_provider:service_provider
       'target_name': 'mojo_service_provider_bindings',
       'type': 'static_library',
       'sources': [

third_party/protobuf/BUILD.gn

@@ -231,6 +231,10 @@ if (current_toolchain == host_toolchain) {
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [ "//build/config/compiler:no_chromium_code" ]
+    if (is_win) {
+      # This is defined internally, don't warn on duplicate.
+      configs -= [ "//build/config/win:lean_and_mean" ]
+    }
 
     cflags = protobuf_lite_cflags