| OLD | NEW | 
|    1 # Copyright 2014 The Chromium Authors. All rights reserved. |    1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
|    2 # Use of this source code is governed by a BSD-style license that can be |    2 # Use of this source code is governed by a BSD-style license that can be | 
|    3 # found in the LICENSE file. |    3 # found in the LICENSE file. | 
|    4  |    4  | 
|    5 import("//tools/grit/grit_rule.gni") |    5 import("//tools/grit/grit_rule.gni") | 
|    6  |    6  | 
|    7 gypi_values = exec_script( |    7 gypi_values = exec_script( | 
|    8     "//build/gypi_to_gn.py", |    8     "//build/gypi_to_gn.py", | 
|    9     [ rebase_path("../chrome_common.gypi") ], |    9     [ rebase_path("../chrome_common.gypi") ], | 
|   10     "scope", |   10     "scope", | 
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  234     defines += [ "MOBILE_SAFE_BROWSING" ] |  234     defines += [ "MOBILE_SAFE_BROWSING" ] | 
|  235   } |  235   } | 
|  236 } |  236 } | 
|  237  |  237  | 
|  238 if (is_linux || is_android) { |  238 if (is_linux || is_android) { | 
|  239   # TODO(brettw) this duplicates "//chrome/common:version" which applies to |  239   # TODO(brettw) this duplicates "//chrome/common:version" which applies to | 
|  240   # Windows. |  240   # Windows. | 
|  241   import("//chrome/version.gni") |  241   import("//chrome/version.gni") | 
|  242   process_version("version") { |  242   process_version("version") { | 
|  243     visibility = [ ":common" ] |  243     visibility = [ ":common" ] | 
|  244     source = "chrome_version_info_posix.h.version" |  244     source = "chrome_version_info_values.h.version" | 
|  245     output = "$target_gen_dir/chrome_version_info_posix.h" |  245     output = "$target_gen_dir/chrome_version_info_values.h" | 
|  246   } |  | 
|  247 } else { |  | 
|  248   # Other platforms have a different way to do versioning. |  | 
|  249   group("version") { |  | 
|  250   } |  246   } | 
|  251 } |  247 } | 
|  252  |  248  | 
|  253 # GN version: chrome/common_constants.gyp:common_constants |  249 # GN version: chrome/common_constants.gyp:common_constants | 
|  254 static_library("constants") { |  250 static_library("constants") { | 
|  255   sources = [ |  251   sources = [ | 
|  256     "chrome_constants.cc", |  252     "chrome_constants.cc", | 
|  257     "chrome_constants.h", |  253     "chrome_constants.h", | 
|  258     "chrome_icon_resources_win.cc", |  254     "chrome_icon_resources_win.cc", | 
|  259     "chrome_icon_resources_win.h", |  255     "chrome_icon_resources_win.h", | 
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  310   if (is_win || is_mac) { |  306   if (is_win || is_mac) { | 
|  311     sources += [ |  307     sources += [ | 
|  312       "media_galleries/picasa_test_util.cc", |  308       "media_galleries/picasa_test_util.cc", | 
|  313       "media_galleries/picasa_test_util.h", |  309       "media_galleries/picasa_test_util.h", | 
|  314       "media_galleries/pmp_test_util.cc", |  310       "media_galleries/pmp_test_util.cc", | 
|  315       "media_galleries/pmp_test_util.h", |  311       "media_galleries/pmp_test_util.h", | 
|  316     ] |  312     ] | 
|  317   } |  313   } | 
|  318  |  314  | 
|  319 } |  315 } | 
| OLD | NEW |