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

Side by Side Diff: chrome/chrome.gyp

Issue 137623002: Let MetricsService know about some Android Activities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: line warp fix Created 6 years, 10 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 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 ['chromeos==1', { 971 ['chromeos==1', {
972 'includes': [ 'chrome_browser_chromeos.gypi' ], 972 'includes': [ 'chrome_browser_chromeos.gypi' ],
973 }], # chromeos==1 973 }], # chromeos==1
974 ['OS=="android"', 974 ['OS=="android"',
975 { 975 {
976 'targets': [ 976 'targets': [
977 { 977 {
978 'target_name': 'chrome_java', 978 'target_name': 'chrome_java',
979 'type': 'none', 979 'type': 'none',
980 'dependencies': [ 980 'dependencies': [
981 'activity_type_ids_java',
981 'chrome_resources.gyp:chrome_strings', 982 'chrome_resources.gyp:chrome_strings',
982 'profile_sync_service_model_type_selection_java', 983 'profile_sync_service_model_type_selection_java',
983 'resource_id_java', 984 'resource_id_java',
984 'toolbar_model_security_levels_java', 985 'toolbar_model_security_levels_java',
985 '../base/base.gyp:base', 986 '../base/base.gyp:base',
986 '../components/components.gyp:autofill_java', 987 '../components/components.gyp:autofill_java',
987 '../components/components.gyp:navigation_interception_java', 988 '../components/components.gyp:navigation_interception_java',
988 '../components/components.gyp:sessions', 989 '../components/components.gyp:sessions',
989 '../components/components.gyp:web_contents_delegate_android_java', 990 '../components/components.gyp:web_contents_delegate_android_java',
990 '../content/content.gyp:content_java', 991 '../content/content.gyp:content_java',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 'sources': [ 1103 'sources': [
1103 'service/cloud_print/print_system_dummy.cc', 1104 'service/cloud_print/print_system_dummy.cc',
1104 ], 1105 ],
1105 }], 1106 }],
1106 ], 1107 ],
1107 }, 1108 },
1108 ], 1109 ],
1109 }], 1110 }],
1110 ], # 'conditions' 1111 ], # 'conditions'
1111 } 1112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698