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

Side by Side Diff: chrome/chrome_shell.gypi

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 | « chrome/android/BUILD.gn ('k') | no next file » | 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 # This GYPI allows independent customization of the chrome shell in a manner 5 # This GYPI allows independent customization of the chrome shell in a manner
6 # similar to content shell (in content_shell.gypi). Notably, this file does 6 # similar to content shell (in content_shell.gypi). Notably, this file does
7 # NOT contain chrome_android_core, which is independent of the chrome shell 7 # NOT contain chrome_android_core, which is independent of the chrome shell
8 # and should be separately customized. 8 # and should be separately customized.
9 { 9 {
10 'variables': { 10 'variables': {
(...skipping 10 matching lines...) Expand all
21 'chrome.gyp:browser_ui', 21 'chrome.gyp:browser_ui',
22 '../content/content.gyp:content_app_browser', 22 '../content/content.gyp:content_app_browser',
23 ], 23 ],
24 'sources': [ 24 'sources': [
25 'android/shell/chrome_shell_google_location_settings_helper.cc', 25 'android/shell/chrome_shell_google_location_settings_helper.cc',
26 'android/shell/chrome_shell_google_location_settings_helper.h', 26 'android/shell/chrome_shell_google_location_settings_helper.h',
27 ], 27 ],
28 'include_dirs': [ 28 'include_dirs': [
29 '../skia/config', 29 '../skia/config',
30 ], 30 ],
31 'direct_dependent_settings': {
32 'ldflags': [
33 # Some android targets still depend on --gc-sections to link.
34 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
35 '-Wl,--gc-sections',
36 ],
37 },
31 'conditions': [ 38 'conditions': [
32 [ 'order_profiling!=0', { 39 [ 'order_profiling!=0', {
33 'conditions': [ 40 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
34 [ 'OS=="android"', {
35 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
36 }],
37 ],
38 }], 41 }],
39 [ 'use_allocator!="none"', { 42 [ 'use_allocator!="none"', {
40 'dependencies': [ 43 'dependencies': [
41 '../base/allocator/allocator.gyp:allocator', ], 44 '../base/allocator/allocator.gyp:allocator', ],
42 }], 45 }],
43 [ 'cld_version==0 or cld_version==2', { 46 [ 'cld_version==0 or cld_version==2', {
44 'dependencies': [ 47 'dependencies': [
45 # Chrome shell should always use the statically-linked CLD data. 48 # Chrome shell should always use the statically-linked CLD data.
46 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ], 49 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
47 }], 50 }],
48 ['OS=="android"', {
49 'direct_dependent_settings': {
50 'ldflags': [
51 # Some android targets still depend on --gc-sections to link.
52 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
53 '-Wl,--gc-sections',
54 ],
55 },
56 }],
57 ], 51 ],
58 }, 52 },
59 { 53 {
60 # GN: //chrome/android:chrome_shell 54 # GN: //chrome/android:chrome_shell
61 'target_name': 'libchromeshell', 55 'target_name': 'libchromeshell',
62 'type': 'shared_library', 56 'type': 'shared_library',
63 'sources': [ 57 'sources': [
64 # This file must always be included in the shared_library step to ensure 58 # This file must always be included in the shared_library step to ensure
65 # JNI_OnLoad is exported. 59 # JNI_OnLoad is exported.
66 'app/android/chrome_jni_onload.cc', 60 'app/android/chrome_jni_onload.cc',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 'target_name': 'chrome_sync_shell_apk_java', 197 'target_name': 'chrome_sync_shell_apk_java',
204 'type': 'none', 198 'type': 'none',
205 'dependencies': [ 199 'dependencies': [
206 'chrome_sync_shell_apk', 200 'chrome_sync_shell_apk',
207 ], 201 ],
208 'includes': [ '../build/apk_fake_jar.gypi' ], 202 'includes': [ '../build/apk_fake_jar.gypi' ],
209 }, 203 },
210 ], 204 ],
211 205
212 } 206 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698