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

Side by Side Diff: chrome/chrome.gyp

Issue 10837143: Make java.gypi export jar path to input_jars_paths variable (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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 | « build/java.gypi ('k') | chrome/chrome_tests.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 (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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 }, 1073 },
1074 ]}, # 'targets' 1074 ]}, # 'targets'
1075 ], # OS=="win" 1075 ], # OS=="win"
1076 ['OS=="android"', 1076 ['OS=="android"',
1077 { 1077 {
1078 'targets': [ 1078 'targets': [
1079 { 1079 {
1080 'target_name': 'chrome_java', 1080 'target_name': 'chrome_java',
1081 'type': 'none', 1081 'type': 'none',
1082 'dependencies': [ 1082 'dependencies': [
1083 '../base/base.gyp:base_java',
nilesh 2012/08/08 22:24:20 I think chrome_java directly depends on base_java
cjhopman 2012/08/08 22:38:57 Done. Also done for content_java target.
1084 '../content/content.gyp:content_java', 1083 '../content/content.gyp:content_java',
1085 '../net/net.gyp:net_java', 1084 ],
nilesh 2012/08/08 22:24:20 Same for net.
cjhopman 2012/08/08 22:38:57 Done.
1085 'export_dependent_settings': [
1086 '../content/content.gyp:content_java',
1086 ], 1087 ],
1087 'variables': { 1088 'variables': {
1088 'package_name': 'chrome', 1089 'package_name': 'chrome',
1089 'java_in_dir': '../chrome/android/java', 1090 'java_in_dir': '../chrome/android/java',
1090 }, 1091 },
1091 'includes': [ '../build/java.gypi' ], 1092 'includes': [ '../build/java.gypi' ],
1092 }, 1093 },
1093 ]}, # 'targets' 1094 ]}, # 'targets'
1094 ], # OS=="android" 1095 ], # OS=="android"
1095 ], # 'conditions' 1096 ], # 'conditions'
1096 } 1097 }
OLDNEW
« no previous file with comments | « build/java.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698