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

Side by Side Diff: chrome/chrome.gyp

Issue 11830043: Move content/components/navigation_interception to src/components (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 11 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
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 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 'includes': [ 'chrome_browser_chromeos.gypi' ], 1067 'includes': [ 'chrome_browser_chromeos.gypi' ],
1068 }], # chromeos==1 1068 }], # chromeos==1
1069 ['OS=="android"', 1069 ['OS=="android"',
1070 { 1070 {
1071 'targets': [ 1071 'targets': [
1072 { 1072 {
1073 'target_name': 'chrome_java', 1073 'target_name': 'chrome_java',
1074 'type': 'none', 1074 'type': 'none',
1075 'dependencies': [ 1075 'dependencies': [
1076 '../base/base.gyp:base', 1076 '../base/base.gyp:base',
1077 '../components/components.gyp:navigation_interception_java',
1077 '../components/components.gyp:web_contents_delegate_android_java', 1078 '../components/components.gyp:web_contents_delegate_android_java',
1078 '../content/content.gyp:content_java', 1079 '../content/content.gyp:content_java',
1079 '../content/content.gyp:navigation_interception_java',
1080 '../sync/sync.gyp:sync_java', 1080 '../sync/sync.gyp:sync_java',
1081 '../third_party/guava/guava.gyp:guava_javalib', 1081 '../third_party/guava/guava.gyp:guava_javalib',
1082 '../ui/ui.gyp:ui_java', 1082 '../ui/ui.gyp:ui_java',
1083 ], 1083 ],
1084 'variables': { 1084 'variables': {
1085 'package_name': 'chrome', 1085 'package_name': 'chrome',
1086 'java_in_dir': '../chrome/android/java', 1086 'java_in_dir': '../chrome/android/java',
1087 'has_java_resources': 1, 1087 'has_java_resources': 1,
1088 'R_package': 'org.chromium.chrome', 1088 'R_package': 'org.chromium.chrome',
1089 'R_package_relpath': 'org/chromium/chrome', 1089 'R_package_relpath': 'org/chromium/chrome',
1090 'java_strings_grd': 'android_chrome_strings.grd', 1090 'java_strings_grd': 'android_chrome_strings.grd',
1091 }, 1091 },
1092 'includes': [ 1092 'includes': [
1093 '../build/java.gypi', 1093 '../build/java.gypi',
1094 ], 1094 ],
1095 }, 1095 },
1096 ], # 'targets' 1096 ], # 'targets'
1097 'includes': [ 1097 'includes': [
1098 'chrome_android.gypi', 1098 'chrome_android.gypi',
1099 ]}, # 'includes' 1099 ]}, # 'includes'
1100 ], # OS=="android" 1100 ], # OS=="android"
1101 ], # 'conditions' 1101 ], # 'conditions'
1102 } 1102 }
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