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

Side by Side Diff: chrome/chrome.gyp

Issue 12282004: Added personal_data_manager android implementation for auto-populating auto-fill on android builds … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed autogenerated nits from trybot 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/android/chrome_jni_registrar.cc ('k') | chrome/chrome_tests_unit.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 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 'targets': [ 1083 'targets': [
1084 { 1084 {
1085 'target_name': 'chrome_java', 1085 'target_name': 'chrome_java',
1086 'type': 'none', 1086 'type': 'none',
1087 'dependencies': [ 1087 'dependencies': [
1088 'chrome_resources.gyp:chrome_strings', 1088 'chrome_resources.gyp:chrome_strings',
1089 'profile_sync_service_model_type_selection_java', 1089 'profile_sync_service_model_type_selection_java',
1090 'toolbar_model_security_levels_java', 1090 'toolbar_model_security_levels_java',
1091 '../base/base.gyp:base', 1091 '../base/base.gyp:base',
1092 '../components/components.gyp:navigation_interception_java', 1092 '../components/components.gyp:navigation_interception_java',
1093 '../components/components.gyp:autofill_java',
1093 '../components/components.gyp:web_contents_delegate_android_java', 1094 '../components/components.gyp:web_contents_delegate_android_java',
1094 '../content/content.gyp:content_java', 1095 '../content/content.gyp:content_java',
1095 '../sync/sync.gyp:sync_java', 1096 '../sync/sync.gyp:sync_java',
1096 '../third_party/guava/guava.gyp:guava_javalib', 1097 '../third_party/guava/guava.gyp:guava_javalib',
1097 '../ui/ui.gyp:ui_java', 1098 '../ui/ui.gyp:ui_java',
1098 ], 1099 ],
1099 'variables': { 1100 'variables': {
1100 'java_in_dir': '../chrome/android/java', 1101 'java_in_dir': '../chrome/android/java',
1101 'has_java_resources': 1, 1102 'has_java_resources': 1,
1102 'R_package': 'org.chromium.chrome', 1103 'R_package': 'org.chromium.chrome',
1103 'R_package_relpath': 'org/chromium/chrome', 1104 'R_package_relpath': 'org/chromium/chrome',
1104 'java_strings_grd': 'android_chrome_strings.grd', 1105 'java_strings_grd': 'android_chrome_strings.grd',
1105 # Include xml string files generated from generated_resources.grd 1106 # Include xml string files generated from generated_resources.grd
1106 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'], 1107 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
1107 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'], 1108 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --o utputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'],
1108 }, 1109 },
1109 'includes': [ 1110 'includes': [
1110 '../build/java.gypi', 1111 '../build/java.gypi',
1111 ], 1112 ],
1112 }, 1113 },
1113 ], # 'targets' 1114 ], # 'targets'
1114 'includes': [ 1115 'includes': [
1115 'chrome_android.gypi', 1116 'chrome_android.gypi',
1116 ]}, # 'includes' 1117 ]}, # 'includes'
1117 ], # OS=="android" 1118 ], # OS=="android"
1118 ], # 'conditions' 1119 ], # 'conditions'
1119 } 1120 }
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698