Chromium Code Reviews| 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("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
| 7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
| 8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
| 9 import("//third_party/icu/config.gni") | 9 import("//third_party/icu/config.gni") |
| 10 import("channel.gni") | 10 import("channel.gni") |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 "java/ResourceId.template", | 161 "java/ResourceId.template", |
| 162 ] | 162 ] |
| 163 package_name = "org/chromium/chrome/browser" | 163 package_name = "org/chromium/chrome/browser" |
| 164 inputs = [ | 164 inputs = [ |
| 165 "../browser/android/resource_id.h", | 165 "../browser/android/resource_id.h", |
| 166 ] | 166 ] |
| 167 } | 167 } |
| 168 | 168 |
| 169 # GYP: //chrome/chrome_shell.gypi:libchromeshell_base | 169 # GYP: //chrome/chrome_shell.gypi:libchromeshell_base |
| 170 static_library("chrome_shell_base") { | 170 static_library("chrome_shell_base") { |
| 171 sources = [ | 171 #sources = [ |
|
Michael van Ouwerkerk
2015/01/19 12:03:14
Did you mean to delete this section?
newt (away)
2015/01/20 16:58:51
Yes, though I'm wondering if I can/should delete t
| |
| 172 "shell/chrome_shell_google_location_settings_helper.cc", | 172 # "shell/chrome_shell_google_location_settings_helper.cc", |
| 173 "shell/chrome_shell_google_location_settings_helper.h", | 173 # "shell/chrome_shell_google_location_settings_helper.h", |
| 174 ] | 174 #] |
| 175 | 175 |
| 176 deps = [ | 176 deps = [ |
| 177 "//chrome/browser/ui", | 177 "//chrome/browser/ui", |
| 178 "//chrome:chrome_android_core", | 178 "//chrome:chrome_android_core", |
| 179 "//base", | 179 "//base", |
| 180 "//base/allocator", | 180 "//base/allocator", |
| 181 "//content/public/app:browser", | 181 "//content/public/app:browser", |
| 182 "//skia", | 182 "//skia", |
| 183 ] | 183 ] |
| 184 | 184 |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 509 ] | 509 ] |
| 510 } | 510 } |
| 511 | 511 |
| 512 zip("chrome_version_srcjar") { | 512 zip("chrome_version_srcjar") { |
| 513 inputs = [ | 513 inputs = [ |
| 514 chrome_version_java_file, | 514 chrome_version_java_file, |
| 515 ] | 515 ] |
| 516 output = "$target_gen_dir/$target_name.srcjar" | 516 output = "$target_gen_dir/$target_name.srcjar" |
| 517 base_dir = chrome_version_java_dir | 517 base_dir = chrome_version_java_dir |
| 518 } | 518 } |
| OLD | NEW |