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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 10704208: Some misc gyp fix-up for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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_tests.gypi » ('j') | chrome/chrome_tests.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 ['_toolset=="target"', { 61 ['_toolset=="target"', {
62 'ldflags': [ 62 'ldflags': [
63 '-Wl,-section-ordering-file=<(order_text_section)' ], 63 '-Wl,-section-ordering-file=<(order_text_section)' ],
64 }], 64 }],
65 ] 65 ]
66 }], 66 }],
67 ['OS == "android"', { 67 ['OS == "android"', {
68 # Don't put the 'chrome' target in 'all' on android 68 # Don't put the 'chrome' target in 'all' on android
69 'suppress_wildcard': 1, 69 'suppress_wildcard': 1,
70 }], 70 }],
71 ['os_posix == 1 and OS != "mac"', { 71 ['os_posix == 1 and OS != "mac" and OS != "android"', {
72 'actions': [ 72 'actions': [
73 { 73 {
74 'action_name': 'manpage', 74 'action_name': 'manpage',
75 'conditions': [ 75 'conditions': [
76 [ 'branding == "Chrome"', { 76 [ 'branding == "Chrome"', {
77 'variables': { 77 'variables': {
78 'name': 'Google Chrome', 78 'name': 'Google Chrome',
79 'filename': 'google-chrome', 79 'filename': 'google-chrome',
80 'confdir': 'google-chrome', 80 'confdir': 'google-chrome',
81 }, 81 },
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 'target_name': 'chrome_nacl_win64', 580 'target_name': 'chrome_nacl_win64',
581 'type': 'none', 581 'type': 'none',
582 'sources': [], 582 'sources': [],
583 }, 583 },
584 ], 584 ],
585 }], 585 }],
586 ], 586 ],
587 }], 587 }],
588 ], 588 ],
589 } 589 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | chrome/chrome_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698