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

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: Rebase 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 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 ['chromeos==1', { 1070 ['chromeos==1', {
1071 'includes': [ 'chrome_browser_chromeos.gypi' ], 1071 'includes': [ 'chrome_browser_chromeos.gypi' ],
1072 }], # chromeos==1 1072 }], # chromeos==1
1073 ['OS=="android"', 1073 ['OS=="android"',
1074 { 1074 {
1075 'targets': [ 1075 'targets': [
1076 { 1076 {
1077 'target_name': 'chrome_java', 1077 'target_name': 'chrome_java',
1078 'type': 'none', 1078 'type': 'none',
1079 'dependencies': [ 1079 'dependencies': [
1080 '../base/base.gyp:base_java', 1080 '../base/base.gyp:base',
1081 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java', 1081 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java',
1082 '../content/content.gyp:content_java', 1082 '../content/content.gyp:content_java',
1083 '../net/net.gyp:net_java',
1084 ], 1083 ],
1085 'export_dependent_settings': [ 1084 'export_dependent_settings': [
1086 '../base/base.gyp:base_java', 1085 '../base/base.gyp:base',
1087 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java', 1086 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java',
1088 '../content/content.gyp:content_java', 1087 '../content/content.gyp:content_java',
1089 '../net/net.gyp:net_java',
1090 ], 1088 ],
1091 'variables': { 1089 'variables': {
1092 'package_name': 'chrome', 1090 'package_name': 'chrome',
1093 'java_in_dir': '../chrome/android/java', 1091 'java_in_dir': '../chrome/android/java',
1094 }, 1092 },
1095 'includes': [ '../build/java.gypi' ], 1093 'includes': [ '../build/java.gypi' ],
1096 }, 1094 },
1097 ]}, # 'targets' 1095 ]}, # 'targets'
1098 ], # OS=="android" 1096 ], # OS=="android"
1099 ], # 'conditions' 1097 ], # 'conditions'
1100 } 1098 }
OLDNEW
« no previous file with comments | « chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698