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

Side by Side Diff: chrome/chrome.gyp

Issue 11293017: Move navigation interception component to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add findbugs suppression for compatibility code. 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 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 'includes': [ 'chrome_browser_chromeos.gypi' ], 1043 'includes': [ 'chrome_browser_chromeos.gypi' ],
1044 }], # chromeos==1 1044 }], # chromeos==1
1045 ['OS=="android"', 1045 ['OS=="android"',
1046 { 1046 {
1047 'targets': [ 1047 'targets': [
1048 { 1048 {
1049 'target_name': 'chrome_java', 1049 'target_name': 'chrome_java',
1050 'type': 'none', 1050 'type': 'none',
1051 'dependencies': [ 1051 'dependencies': [
1052 '../base/base.gyp:base', 1052 '../base/base.gyp:base',
1053 '../chrome/browser/component/components.gyp:navigation_interception_ java',
1054 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java', 1053 '../chrome/browser/component/components.gyp:web_contents_delegate_an droid_java',
1054 '../content/content.gyp:navigation_interception_java',
1055 '../content/content.gyp:content_java', 1055 '../content/content.gyp:content_java',
1056 '../ui/ui.gyp:ui_java', 1056 '../ui/ui.gyp:ui_java',
1057 ], 1057 ],
1058 'variables': { 1058 'variables': {
1059 'package_name': 'chrome', 1059 'package_name': 'chrome',
1060 'java_in_dir': '../chrome/android/java', 1060 'java_in_dir': '../chrome/android/java',
1061 }, 1061 },
1062 'includes': [ 1062 'includes': [
1063 '../build/java.gypi', 1063 '../build/java.gypi',
1064 ], 1064 ],
1065 }, 1065 },
1066 ], # 'targets' 1066 ], # 'targets'
1067 'includes': [ 1067 'includes': [
1068 'chrome_android.gypi', 1068 'chrome_android.gypi',
1069 ]}, # 'includes' 1069 ]}, # 'includes'
1070 ], # OS=="android" 1070 ], # OS=="android"
1071 ], # 'conditions' 1071 ], # 'conditions'
1072 } 1072 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698