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

Side by Side Diff: chrome/chrome.gyp

Issue 11365199: Move WebContentsDelegateAndroid to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 'includes': [ 'chrome_browser_chromeos.gypi' ], 1044 'includes': [ 'chrome_browser_chromeos.gypi' ],
1045 }], # chromeos==1 1045 }], # chromeos==1
1046 ['OS=="android"', 1046 ['OS=="android"',
1047 { 1047 {
1048 'targets': [ 1048 'targets': [
1049 { 1049 {
1050 'target_name': 'chrome_java', 1050 'target_name': 'chrome_java',
1051 'type': 'none', 1051 'type': 'none',
1052 'dependencies': [ 1052 'dependencies': [
1053 '../base/base.gyp:base', 1053 '../base/base.gyp:base',
1054 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java', 1054 '../content/content.gyp:web_contents_delegate_android_java',
jam 2012/11/12 17:24:40 nit: order
John Knottenbelt 2012/11/12 18:07:46 Done.
1055 '../content/content.gyp:navigation_interception_java', 1055 '../content/content.gyp:navigation_interception_java',
1056 '../content/content.gyp:content_java', 1056 '../content/content.gyp:content_java',
1057 '../ui/ui.gyp:ui_java', 1057 '../ui/ui.gyp:ui_java',
1058 ], 1058 ],
1059 'variables': { 1059 'variables': {
1060 'package_name': 'chrome', 1060 'package_name': 'chrome',
1061 'java_in_dir': '../chrome/android/java', 1061 'java_in_dir': '../chrome/android/java',
1062 }, 1062 },
1063 'includes': [ 1063 'includes': [
1064 '../build/java.gypi', 1064 '../build/java.gypi',
1065 ], 1065 ],
1066 }, 1066 },
1067 ], # 'targets' 1067 ], # 'targets'
1068 'includes': [ 1068 'includes': [
1069 'chrome_android.gypi', 1069 'chrome_android.gypi',
1070 ]}, # 'includes' 1070 ]}, # 'includes'
1071 ], # OS=="android" 1071 ], # OS=="android"
1072 ], # 'conditions' 1072 ], # 'conditions'
1073 } 1073 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698