Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Side by Side Diff: chrome/android/BUILD.gn

Issue 810193006: Remove redundant OS checks in chrome_shell.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/chrome_shell.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 "//content/public/app:browser", 181 "//content/public/app:browser",
182 "//skia", 182 "//skia",
183 ] 183 ]
184 184
185 # Some android targets still depend on --gc-sections to link. 185 # Some android targets still depend on --gc-sections to link.
186 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 186 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
187 ldflags = [ "-Wl,--gc-sections" ] 187 ldflags = [ "-Wl,--gc-sections" ]
188 188
189 # TODO(GYP): 189 # TODO(GYP):
190 #[ 'order_profiling!=0', { 190 #[ 'order_profiling!=0', {
191 #'conditions': [
192 #[ 'OS=="android"', {
193 #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], 191 #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
194 #}], 192 #}],
195 #],
196 #}],
197 } 193 }
198 194
199 # GYP: //chrome/chrome_shell.gypi:libchromeshell 195 # GYP: //chrome/chrome_shell.gypi:libchromeshell
200 shared_library("chrome_shell") { 196 shared_library("chrome_shell") {
201 testonly = true 197 testonly = true
202 sources = [ 198 sources = [
203 # This file must always be included in the shared_library step to ensure 199 # This file must always be included in the shared_library step to ensure
204 # JNI_OnLoad is exported. 200 # JNI_OnLoad is exported.
205 "//chrome/app/android/chrome_jni_onload.cc", 201 "//chrome/app/android/chrome_jni_onload.cc",
206 "shell/chrome_main_delegate_chrome_shell_android.cc", 202 "shell/chrome_main_delegate_chrome_shell_android.cc",
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 ] 507 ]
512 } 508 }
513 509
514 zip("chrome_version_srcjar") { 510 zip("chrome_version_srcjar") {
515 inputs = [ 511 inputs = [
516 chrome_version_java_file, 512 chrome_version_java_file,
517 ] 513 ]
518 output = "$target_gen_dir/$target_name.srcjar" 514 output = "$target_gen_dir/$target_name.srcjar"
519 base_dir = chrome_version_java_dir 515 base_dir = chrome_version_java_dir
520 } 516 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698