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

Side by Side Diff: chrome/chrome.gyp

Issue 14497003: Moves TabNavigation into components/sessions and renames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really remove webkit_support Created 7 years, 7 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
« no previous file with comments | « chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 { 1103 {
1104 'targets': [ 1104 'targets': [
1105 { 1105 {
1106 'target_name': 'chrome_java', 1106 'target_name': 'chrome_java',
1107 'type': 'none', 1107 'type': 'none',
1108 'dependencies': [ 1108 'dependencies': [
1109 'chrome_resources.gyp:chrome_strings', 1109 'chrome_resources.gyp:chrome_strings',
1110 'profile_sync_service_model_type_selection_java', 1110 'profile_sync_service_model_type_selection_java',
1111 'toolbar_model_security_levels_java', 1111 'toolbar_model_security_levels_java',
1112 '../base/base.gyp:base', 1112 '../base/base.gyp:base',
1113 '../components/components.gyp:autofill_java',
1113 '../components/components.gyp:navigation_interception_java', 1114 '../components/components.gyp:navigation_interception_java',
1114 '../components/components.gyp:autofill_java', 1115 '../components/components.gyp:sessions',
1115 '../components/components.gyp:web_contents_delegate_android_java', 1116 '../components/components.gyp:web_contents_delegate_android_java',
1116 '../content/content.gyp:content_java', 1117 '../content/content.gyp:content_java',
1117 '../sync/sync.gyp:sync_java', 1118 '../sync/sync.gyp:sync_java',
1118 '../third_party/guava/guava.gyp:guava_javalib', 1119 '../third_party/guava/guava.gyp:guava_javalib',
1119 '../ui/ui.gyp:ui_java', 1120 '../ui/ui.gyp:ui_java',
1120 ], 1121 ],
1121 'variables': { 1122 'variables': {
1122 'java_in_dir': '../chrome/android/java', 1123 'java_in_dir': '../chrome/android/java',
1123 'has_java_resources': 1, 1124 'has_java_resources': 1,
1124 'R_package': 'org.chromium.chrome', 1125 'R_package': 'org.chromium.chrome',
1125 'R_package_relpath': 'org/chromium/chrome', 1126 'R_package_relpath': 'org/chromium/chrome',
1126 'java_strings_grd': 'android_chrome_strings.grd', 1127 'java_strings_grd': 'android_chrome_strings.grd',
1127 # Include xml string files generated from generated_resources.grd 1128 # Include xml string files generated from generated_resources.grd
1128 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'], 1129 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
1129 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'], 1130 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'],
1130 }, 1131 },
1131 'includes': [ 1132 'includes': [
1132 '../build/java.gypi', 1133 '../build/java.gypi',
1133 ], 1134 ],
1134 }, 1135 },
1135 ], # 'targets' 1136 ], # 'targets'
1136 'includes': [ 1137 'includes': [
1137 'chrome_android.gypi', 1138 'chrome_android.gypi',
1138 ]}, # 'includes' 1139 ]}, # 'includes'
1139 ], # OS=="android" 1140 ], # OS=="android"
1140 ], # 'conditions' 1141 ], # 'conditions'
1141 } 1142 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698