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

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: revert 0 to Histogram::kNoFlags Created 6 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 963 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 ['chromeos==1', { 974 ['chromeos==1', {
975 'includes': [ 'chrome_browser_chromeos.gypi' ], 975 'includes': [ 'chrome_browser_chromeos.gypi' ],
976 }], # chromeos==1 976 }], # chromeos==1
977 ['OS=="android"', 977 ['OS=="android"',
978 { 978 {
979 'targets': [ 979 'targets': [
980 { 980 {
981 'target_name': 'chrome_java', 981 'target_name': 'chrome_java',
982 'type': 'none', 982 'type': 'none',
983 'dependencies': [ 983 'dependencies': [
984 'activity_type_ids_java',
984 'chrome_resources.gyp:chrome_strings', 985 'chrome_resources.gyp:chrome_strings',
985 'profile_sync_service_model_type_selection_java', 986 'profile_sync_service_model_type_selection_java',
986 'resource_id_java', 987 'resource_id_java',
987 'toolbar_model_security_levels_java', 988 'toolbar_model_security_levels_java',
988 '../base/base.gyp:base', 989 '../base/base.gyp:base',
989 '../components/components.gyp:autofill_java', 990 '../components/components.gyp:autofill_java',
990 '../components/components.gyp:navigation_interception_java', 991 '../components/components.gyp:navigation_interception_java',
991 '../components/components.gyp:sessions', 992 '../components/components.gyp:sessions',
992 '../components/components.gyp:web_contents_delegate_android_java', 993 '../components/components.gyp:web_contents_delegate_android_java',
993 '../content/content.gyp:content_java', 994 '../content/content.gyp:content_java',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 'sources': [ 1106 'sources': [
1106 'service/cloud_print/print_system_dummy.cc', 1107 'service/cloud_print/print_system_dummy.cc',
1107 ], 1108 ],
1108 }], 1109 }],
1109 ], 1110 ],
1110 }, 1111 },
1111 ], 1112 ],
1112 }], 1113 }],
1113 ], # 'conditions' 1114 ], # 'conditions'
1114 } 1115 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698