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

Side by Side Diff: chrome/chrome.gyp

Issue 12313075: [sync] Upstream the Android ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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/sync/sync_prefs.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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 ['chromeos==1', { 1073 ['chromeos==1', {
1074 'includes': [ 'chrome_browser_chromeos.gypi' ], 1074 'includes': [ 'chrome_browser_chromeos.gypi' ],
1075 }], # chromeos==1 1075 }], # chromeos==1
1076 ['OS=="android"', 1076 ['OS=="android"',
1077 { 1077 {
1078 'targets': [ 1078 'targets': [
1079 { 1079 {
1080 'target_name': 'chrome_java', 1080 'target_name': 'chrome_java',
1081 'type': 'none', 1081 'type': 'none',
1082 'dependencies': [ 1082 'dependencies': [
1083 'profile_sync_service_model_type_selection_java',
1083 'toolbar_model_security_levels_java', 1084 'toolbar_model_security_levels_java',
1084 '../base/base.gyp:base', 1085 '../base/base.gyp:base',
1085 '../components/components.gyp:navigation_interception_java', 1086 '../components/components.gyp:navigation_interception_java',
1086 '../components/components.gyp:web_contents_delegate_android_java', 1087 '../components/components.gyp:web_contents_delegate_android_java',
1087 '../content/content.gyp:content_java', 1088 '../content/content.gyp:content_java',
1088 '../sync/sync.gyp:sync_java', 1089 '../sync/sync.gyp:sync_java',
1089 '../third_party/guava/guava.gyp:guava_javalib', 1090 '../third_party/guava/guava.gyp:guava_javalib',
1090 '../ui/ui.gyp:ui_java', 1091 '../ui/ui.gyp:ui_java',
1091 ], 1092 ],
1092 'variables': { 1093 'variables': {
1093 'java_in_dir': '../chrome/android/java', 1094 'java_in_dir': '../chrome/android/java',
1094 'has_java_resources': 1, 1095 'has_java_resources': 1,
1095 'R_package': 'org.chromium.chrome', 1096 'R_package': 'org.chromium.chrome',
1096 'R_package_relpath': 'org/chromium/chrome', 1097 'R_package_relpath': 'org/chromium/chrome',
1097 'java_strings_grd': 'android_chrome_strings.grd', 1098 'java_strings_grd': 'android_chrome_strings.grd',
1098 }, 1099 },
1099 'includes': [ 1100 'includes': [
1100 '../build/java.gypi', 1101 '../build/java.gypi',
1101 ], 1102 ],
1102 }, 1103 },
1103 ], # 'targets' 1104 ], # 'targets'
1104 'includes': [ 1105 'includes': [
1105 'chrome_android.gypi', 1106 'chrome_android.gypi',
1106 ]}, # 'includes' 1107 ]}, # 'includes'
1107 ], # OS=="android" 1108 ], # OS=="android"
1108 ], # 'conditions' 1109 ], # 'conditions'
1109 } 1110 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_prefs.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698