Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / common / BUILD.gn

diff --git a/src/chrome/common/BUILD.gn b/src/chrome/common/BUILD.gn
index 98a612b..8167270 100644 (file)
--- a/src/chrome/common/BUILD.gn
+++ b/src/chrome/common/BUILD.gn
@@ -24,6 +24,8 @@ grit("resources") {
 
 # GYP version: chrome/chrome_resources.gyp:chrome_resources
 #              (generate_extensions_api_resources action)
+if (enable_extensions) {
+
 grit("extensions_api_resources") {
   source = "extensions_api_resources.grd"
   output_dir = "$root_gen_dir/chrome"
@@ -33,6 +35,8 @@ grit("extensions_api_resources") {
   ]
 }
 
+}
+
 # GYP version: chrome/chrome_common.gyp:common
 static_library("common") {
   sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome")
@@ -62,6 +66,7 @@ static_library("common") {
     "//components/variations",
     "//content/public/common",
     "//crypto",
+    "//extensions/common:common_constants",
     "//media/cast:net",
     "//net",
     "//skia",
@@ -99,13 +104,12 @@ static_library("common") {
         gypi_values.chrome_common_extensions_sources,
         ".", "//chrome")
     deps += [
-      "//device/bluetooth",  # TODO(thestig) Still needed? Not in gyp version.
       "//device/usb",
       "//chrome/common/extensions/api",
       "//extensions/common",
       "//extensions/common/api",
-      "//extensions/strings",
       "//extensions:extensions_resources",
+      "//extensions/strings",
     ]
   }
 
@@ -141,14 +145,14 @@ static_library("common") {
   }
 
   # Printing.
-  if (printing_mode == 0) {
+  if (!enable_basic_printing && !enable_print_preview) {
     sources -= [
       "print_messages.cc",
       "print_messages.h",
     ]
   } else {
     deps += [ "//printing" ]
-    if (printing_mode == 1) {
+    if (enable_print_preview) {
       # Full printing support.
       sources += rebase_path(
           gypi_values.chrome_common_service_process_sources,
@@ -173,7 +177,6 @@ static_library("common") {
     sources -= [
       "badge_util.cc",
       "chrome_version_info_posix.cc",
-      "extensions/manifest_handlers/minimum_chrome_version_checker.cc",
       "icon_with_badge_image_source.cc",
       "media_galleries/metadata_types.h",
       "spellcheck_common.cc",
@@ -185,6 +188,10 @@ static_library("common") {
         ".", "//chrome")
   }
 
+  if (is_chromeos) {
+    sources -= [ "chrome_version_info_posix.cc" ]
+  }
+
   if (is_win) {
     deps += [ "//third_party/wtl" ]
   }
@@ -235,19 +242,11 @@ static_library("common") {
   }
 }
 
-if (is_linux || is_android) {
-  # TODO(brettw) this duplicates "//chrome/common:version" which applies to
-  # Windows.
-  import("//chrome/version.gni")
-  process_version("version") {
-    visibility = [ ":common" ]
-    source = "chrome_version_info_posix.h.version"
-    output = "$target_gen_dir/chrome_version_info_posix.h"
-  }
-} else {
-  # Other platforms have a different way to do versioning.
-  group("version") {
-  }
+import("//chrome/version.gni")
+process_version("version") {
+  visibility = [ ":common" ]
+  source = "chrome_version_info_values.h.version"
+  output = "$target_gen_dir/chrome_version_info_values.h"
 }
 
 # GN version: chrome/common_constants.gyp:common_constants
@@ -297,8 +296,6 @@ source_set("test_support") {
   visibility = [ "//chrome/test:test_support" ]
 
   sources = [
-    "extensions/extension_test_util.cc",
-    "extensions/extension_test_util.h",
   ]
 
   deps = [
@@ -316,4 +313,11 @@ source_set("test_support") {
     ]
   }
 
+  if (enable_extensions) {
+    sources += [
+      "extensions/extension_test_util.cc",
+      "extensions/extension_test_util.h",
+    ]
+  }
+
 }