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

Side by Side Diff: chrome/chrome.gyp

Issue 10986094: Make java.gypi use all_dependent_settings for input_jars_paths (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_combine
Patch Set: Created 8 years, 2 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_android.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 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 'targets': [ 1083 'targets': [
1084 { 1084 {
1085 'target_name': 'chrome_java', 1085 'target_name': 'chrome_java',
1086 'type': 'none', 1086 'type': 'none',
1087 'dependencies': [ 1087 'dependencies': [
1088 '../base/base.gyp:base', 1088 '../base/base.gyp:base',
1089 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java', 1089 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java',
1090 '../content/content.gyp:content_java', 1090 '../content/content.gyp:content_java',
1091 '../ui/ui.gyp:ui_java', 1091 '../ui/ui.gyp:ui_java',
1092 ], 1092 ],
1093 'export_dependent_settings': [
1094 '../base/base.gyp:base',
1095 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java',
1096 '../content/content.gyp:content_java',
1097 '../ui/ui.gyp:ui_java',
1098 ],
1099 'variables': { 1093 'variables': {
1100 'package_name': 'chrome', 1094 'package_name': 'chrome',
1101 'java_in_dir': '../chrome/android/java', 1095 'java_in_dir': '../chrome/android/java',
1102 }, 1096 },
1103 'includes': [ 1097 'includes': [
1104 '../build/java.gypi', 1098 '../build/java.gypi',
1105 ], 1099 ],
1106 }, 1100 },
1107 ], # 'targets' 1101 ], # 'targets'
1108 'includes': [ 1102 'includes': [
1109 'chrome_android.gypi', 1103 'chrome_android.gypi',
1110 ]}, # 'includes' 1104 ]}, # 'includes'
1111 ], # OS=="android" 1105 ], # OS=="android"
1112 ], # 'conditions' 1106 ], # 'conditions'
1113 } 1107 }
OLDNEW
« no previous file with comments | « build/java.gypi ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698