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

Side by Side Diff: chrome/chrome.gyp

Issue 10918113: Add initial Chromium TestShell support for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up some of the code. Created 8 years, 3 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 | Annotate | Revision Log
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 ], # conditions 130 ], # conditions
131 }, # variables 131 }, # variables
132 'includes': [ 132 'includes': [
133 # Place some targets in gypi files to reduce contention on this file. 133 # Place some targets in gypi files to reduce contention on this file.
134 # By using an include, we keep everything in a single xcodeproj file. 134 # By using an include, we keep everything in a single xcodeproj file.
135 # Note on Win64 targets: targets that end with win64 be used 135 # Note on Win64 targets: targets that end with win64 be used
136 # on 64-bit Windows only. Targets that end with nacl_win64 should be used 136 # on 64-bit Windows only. Targets that end with nacl_win64 should be used
137 # by Native Client only. 137 # by Native Client only.
138 '../build/win_precompile.gypi', 138 '../build/win_precompile.gypi',
139 'app/policy/policy_templates.gypi', 139 'app/policy/policy_templates.gypi',
140 'chrome_android.gypi',
Yaron 2012/09/07 20:53:43 This should probably be conditionally included for
David Trainor- moved to gerrit 2012/09/10 18:09:13 Done.
140 'chrome_browser.gypi', 141 'chrome_browser.gypi',
141 'chrome_browser_extensions.gypi', 142 'chrome_browser_extensions.gypi',
142 'chrome_browser_ui.gypi', 143 'chrome_browser_ui.gypi',
143 'chrome_common.gypi', 144 'chrome_common.gypi',
144 'chrome_dll.gypi', 145 'chrome_dll.gypi',
145 'chrome_exe.gypi', 146 'chrome_exe.gypi',
146 'chrome_installer.gypi', 147 'chrome_installer.gypi',
147 'chrome_installer_util.gypi', 148 'chrome_installer_util.gypi',
148 'chrome_renderer.gypi', 149 'chrome_renderer.gypi',
149 'chrome_tests.gypi', 150 'chrome_tests.gypi',
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 'variables': { 1091 'variables': {
1091 'package_name': 'chrome', 1092 'package_name': 'chrome',
1092 'java_in_dir': '../chrome/android/java', 1093 'java_in_dir': '../chrome/android/java',
1093 }, 1094 },
1094 'includes': [ '../build/java.gypi' ], 1095 'includes': [ '../build/java.gypi' ],
1095 }, 1096 },
1096 ]}, # 'targets' 1097 ]}, # 'targets'
1097 ], # OS=="android" 1098 ], # OS=="android"
1098 ], # 'conditions' 1099 ], # 'conditions'
1099 } 1100 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698