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

Side by Side Diff: chrome/chrome.gyp

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Peter's comment 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 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 ['chromeos==1', { 1068 ['chromeos==1', {
1069 'includes': [ 'chrome_browser_chromeos.gypi' ], 1069 'includes': [ 'chrome_browser_chromeos.gypi' ],
1070 }], # chromeos==1 1070 }], # chromeos==1
1071 ['OS=="android"', 1071 ['OS=="android"',
1072 { 1072 {
1073 'targets': [ 1073 'targets': [
1074 { 1074 {
1075 'target_name': 'chrome_java', 1075 'target_name': 'chrome_java',
1076 'type': 'none', 1076 'type': 'none',
1077 'dependencies': [ 1077 'dependencies': [
1078 '../base/base.gyp:base_java', 1078 '../base/base.gyp:base',
1079 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java', 1079 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java',
1080 '../content/content.gyp:content_java', 1080 '../content/content.gyp:content_java',
1081 '../net/net.gyp:net_java',
1082 ], 1081 ],
1083 'export_dependent_settings': [ 1082 'export_dependent_settings': [
1084 '../base/base.gyp:base_java', 1083 '../base/base.gyp:base',
1085 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java', 1084 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java',
1086 '../content/content.gyp:content_java', 1085 '../content/content.gyp:content_java',
1087 '../net/net.gyp:net_java',
1088 ], 1086 ],
1089 'variables': { 1087 'variables': {
1090 'package_name': 'chrome', 1088 'package_name': 'chrome',
1091 'java_in_dir': '../chrome/android/java', 1089 'java_in_dir': '../chrome/android/java',
1092 }, 1090 },
1093 'includes': [ '../build/java.gypi' ], 1091 'includes': [ '../build/java.gypi' ],
1094 }, 1092 },
1095 ]}, # 'targets' 1093 ]}, # 'targets'
1096 ], # OS=="android" 1094 ], # OS=="android"
1097 ], # 'conditions' 1095 ], # 'conditions'
1098 } 1096 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698