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

Unified Diff: sync/sync_tests.gypi

Issue 998373004: Sync: Generalize entity injection in Android tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix CreateForInjection calls Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/sync.gyp ('k') | sync/test/fake_server/android/fake_server_helper_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sync_tests.gypi
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 8f2b35b4198038fade26c9777d4d65acca517b31..3ea5b234fcb3caa37f8a75f6c8af97e8a97fd34f 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -469,6 +469,43 @@
'includes': [ '../build/jni_generator.gypi' ],
},
{
+ # TODO(pvalenzuela): Create GN version of this target.
+ # http://crbug.com/475612
+ 'target_name': 'test_support_sync_proto_java',
+ 'type': 'none',
+ 'variables': {
+ 'proto_in_dir': '<(INTERMEDIATE_DIR)/sync_protos',
+ # Set this variable so that sync_proto_source_paths refers to the
+ # temporary proto definitions created here.
+ 'sync_proto_sources_dir': '<(INTERMEDIATE_DIR)/sync_protos',
+ },
+ 'actions': [
+ {
+ 'action_name': 'run_script',
+ 'inputs': [
+ 'protocol/prepare_protos_for_java_tests.py',
+ # Use the original list of proto files (defined in sync.gyp).
+ '<@(sync_proto_sources)',
+ ],
+ 'outputs': [
+ '<@(sync_proto_source_paths)',
+ ],
+ 'action': [
+ 'python',
+ 'protocol/prepare_protos_for_java_tests.py',
+ '--output_dir',
+ '<(INTERMEDIATE_DIR)/sync_protos',
+ # Use the original list of proto files (defined in sync.gyp).
+ '<@(sync_proto_sources)'
+ ],
+ },
+ ],
+ 'sources': [
+ '<@(sync_proto_source_paths)',
+ ],
+ 'includes': ['protocol/protocol.gypi', '../build/protoc_java.gypi'],
+ },
+ {
# GN: //sync:test_support_sync_fake_server_android
'target_name': 'test_support_sync_fake_server_android',
'type': 'static_library',
« no previous file with comments | « sync/sync.gyp ('k') | sync/test/fake_server/android/fake_server_helper_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698