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

Side by Side Diff: chrome/android/chrome_apk.gyp

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/DEPS » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'includes': [ 5 'includes': [
6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces. 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces.
7 '../../build/util/version.gypi' 7 '../../build/util/version.gypi'
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 }, 134 },
135 { 135 {
136 # GN: //chrome/android:chrome_sync_shell 136 # GN: //chrome/android:chrome_sync_shell
137 'target_name': 'libchrome_sync_shell', 137 'target_name': 'libchrome_sync_shell',
138 'type': 'shared_library', 138 'type': 'shared_library',
139 'sources': [ 139 'sources': [
140 '<@(chrome_sync_shell_app_native_sources)', 140 '<@(chrome_sync_shell_app_native_sources)',
141 ], 141 ],
142 'dependencies': [ 142 'dependencies': [
143 'libchrome_base', 143 'libchrome_base',
144 '../../sync/sync.gyp:sync', 144 '../../components/sync.gyp:sync',
145 '../../sync/sync.gyp:test_support_sync_fake_server_android', 145 '../../components/sync.gyp:test_support_sync_fake_server_android',
146 ], 146 ],
147 }, 147 },
148 { 148 {
149 # GN: //chrome/android:chrome_public_apk_manifest 149 # GN: //chrome/android:chrome_public_apk_manifest
150 'target_name': 'chrome_public_manifest', 150 'target_name': 'chrome_public_manifest',
151 'type': 'none', 151 'type': 'none',
152 'variables': { 152 'variables': {
153 'jinja_inputs': ['java/AndroidManifest.xml'], 153 'jinja_inputs': ['java/AndroidManifest.xml'],
154 'jinja_output': '<(chrome_public_apk_manifest)', 154 'jinja_output': '<(chrome_public_apk_manifest)',
155 'jinja_variables': [ 155 'jinja_variables': [
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 ], 238 ],
239 }, 239 },
240 'dependencies': [ 240 'dependencies': [
241 'chrome_android_paks_copy', 241 'chrome_android_paks_copy',
242 'chrome_sync_shell_apk_template_resources', 242 'chrome_sync_shell_apk_template_resources',
243 'libchrome_sync_shell', 243 'libchrome_sync_shell',
244 '../chrome.gyp:chrome_java', 244 '../chrome.gyp:chrome_java',
245 # This exists here because com.google.protobuf.nano is needed in tests, 245 # This exists here because com.google.protobuf.nano is needed in tests,
246 # but that code is stripped out via proguard. Adding this deps adds 246 # but that code is stripped out via proguard. Adding this deps adds
247 # usages and prevents removal of the proto code. 247 # usages and prevents removal of the proto code.
248 '../../sync/sync.gyp:test_support_sync_proto_java', 248 '../../components/sync.gyp:test_support_sync_proto_java',
249 ], 249 ],
250 'includes': [ 'chrome_apk.gypi' ], 250 'includes': [ 'chrome_apk.gypi' ],
251 }, 251 },
252 { 252 {
253 # GN: N/A 253 # GN: N/A
254 # chrome_sync_shell_apk creates a .jar as a side effect. Any java targets 254 # chrome_sync_shell_apk creates a .jar as a side effect. Any java targets
255 # that need that .jar in their classpath should depend on this target. 255 # that need that .jar in their classpath should depend on this target.
256 'target_name': 'chrome_sync_shell_apk_java', 256 'target_name': 'chrome_sync_shell_apk_java',
257 'type': 'none', 257 'type': 'none',
258 'dependencies': [ 258 'dependencies': [
(...skipping 17 matching lines...) Expand all
276 '../../components/components.gyp:gcm_driver_java', 276 '../../components/components.gyp:gcm_driver_java',
277 '../../components/components.gyp:offline_page_model_enums_java', 277 '../../components/components.gyp:offline_page_model_enums_java',
278 '../../components/components.gyp:precache_javatests', 278 '../../components/components.gyp:precache_javatests',
279 '../../components/components.gyp:security_state_enums_java', 279 '../../components/components.gyp:security_state_enums_java',
280 '../../components/components.gyp:web_contents_delegate_android_java', 280 '../../components/components.gyp:web_contents_delegate_android_java',
281 '../../content/content_shell_and_tests.gyp:content_java_test_support', 281 '../../content/content_shell_and_tests.gyp:content_java_test_support',
282 '../../mojo/mojo_public.gyp:mojo_bindings_java', 282 '../../mojo/mojo_public.gyp:mojo_bindings_java',
283 '../../mojo/mojo_public.gyp:mojo_public_java', 283 '../../mojo/mojo_public.gyp:mojo_public_java',
284 '../../net/net.gyp:net_java', 284 '../../net/net.gyp:net_java',
285 '../../net/net.gyp:net_java_test_support', 285 '../../net/net.gyp:net_java_test_support',
286 '../../sync/sync.gyp:sync_java_test_support', 286 '../../components/sync.gyp:sync_java_test_support',
287 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib', 287 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib',
288 '../../third_party/android_tools/android_tools.gyp:google_play_services_ javalib', 288 '../../third_party/android_tools/android_tools.gyp:google_play_services_ javalib',
289 '../../third_party/WebKit/public/blink.gyp:android_mojo_bindings_java', 289 '../../third_party/WebKit/public/blink.gyp:android_mojo_bindings_java',
290 '../../ui/android/ui_android.gyp:ui_javatests', 290 '../../ui/android/ui_android.gyp:ui_javatests',
291 ], 291 ],
292 'includes': [ '../../build/java.gypi' ], 292 'includes': [ '../../build/java.gypi' ],
293 }, 293 },
294 { 294 {
295 # GN: //chrome/android:chrome_public_test_apk_manifest 295 # GN: //chrome/android:chrome_public_test_apk_manifest
296 'target_name': 'chrome_public_test_apk_manifest', 296 'target_name': 'chrome_public_test_apk_manifest',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 { 352 {
353 # GN: //chrome/android:chrome_sync_shell_test_apk 353 # GN: //chrome/android:chrome_sync_shell_test_apk
354 'target_name': 'chrome_sync_shell_test_apk', 354 'target_name': 'chrome_sync_shell_test_apk',
355 'type': 'none', 355 'type': 'none',
356 'dependencies': [ 356 'dependencies': [
357 'chrome_sync_shell_apk_java', 357 'chrome_sync_shell_apk_java',
358 '../../base/base.gyp:base_java', 358 '../../base/base.gyp:base_java',
359 '../../base/base.gyp:base_java_test_support', 359 '../../base/base.gyp:base_java_test_support',
360 '../../chrome/chrome.gyp:chrome_java', 360 '../../chrome/chrome.gyp:chrome_java',
361 '../../chrome/chrome.gyp:chrome_java_test_support', 361 '../../chrome/chrome.gyp:chrome_java_test_support',
362 '../../sync/sync.gyp:sync_java', 362 '../../components/sync.gyp:sync_java',
363 '../../sync/sync.gyp:sync_java_test_support', 363 '../../components/sync.gyp:sync_java_test_support',
364 '../../sync/sync.gyp:sync_javatests', 364 '../../components/sync.gyp:sync_javatests',
365 '../../sync/sync.gyp:test_support_sync_proto_java', 365 '../../components/sync.gyp:test_support_sync_proto_java',
366 '../../testing/android/on_device_instrumentation.gyp:broker_java', 366 '../../testing/android/on_device_instrumentation.gyp:broker_java',
367 '../../testing/android/on_device_instrumentation.gyp:require_driver_apk' , 367 '../../testing/android/on_device_instrumentation.gyp:require_driver_apk' ,
368 ], 368 ],
369 'variables': { 369 'variables': {
370 'android_manifest_path': '<(chrome_sync_shell_test_apk_manifest)', 370 'android_manifest_path': '<(chrome_sync_shell_test_apk_manifest)',
371 'package_name': 'chrome_sync_shell_test', 371 'package_name': 'chrome_sync_shell_test',
372 'java_in_dir': 'sync_shell/javatests', 372 'java_in_dir': 'sync_shell/javatests',
373 'apk_name': 'ChromeSyncShellTest', 373 'apk_name': 'ChromeSyncShellTest',
374 'is_test_apk': 1, 374 'is_test_apk': 1,
375 'test_type': 'instrumentation', 375 'test_type': 'instrumentation',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 } 414 }
415 ], 415 ],
416 ], 416 ],
417 } 417 }
418 418
419 # Local Variables: 419 # Local Variables:
420 # tab-width:2 420 # tab-width:2
421 # indent-tabs-mode:nil 421 # indent-tabs-mode:nil
422 # End: 422 # End:
423 # vim: set expandtab tabstop=2 shiftwidth=2: 423 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698