Sync: Generalize entity injection in Android tests

sync/sync_tests.gypi

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',

[Nicolas Zea, 2015/04/09 20:38:16]

is this used for anything?

[pval...(no longer on Chromium), 2015/04/09 21:28:05]

yeah. see protoc_java.gypi (included in line 506 here)

[Nicolas Zea, 2015/04/09 21:40:42]

Acknowledged.

+            # 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)'

[Nicolas Zea, 2015/04/09 20:38:16]

This might be my lack of gyp experience, but sync_proto_sources, as defined
here, won't include INTERMEDIATE_DIR in its path? Even though we do expect
sync_proto_source_paths (a few lines below) to have INTERMEDIATE_DIR?

[pval...(no longer on Chromium), 2015/04/09 21:28:05]

I believe the dir is in the path/can be accessed by default. This is supported
by the fact that it works as-is, and this description (from GYP docs):

"INTERMEDIATE_DIR: A directory that can be used to place intermediate build
results in. INTERMEDIATE_DIR is only guaranteed to be accessible within a single
target (See targets). This variable is most useful within the context of rules
and actions (See rules, See actions). Compare with SHARED_INTERMEDIATE_DIR."

[nyquist, 2015/04/09 21:53:52]

zea: sync_proto_sources is set to the expansion of sync_proto_source_paths, and
sync_proto_source_paths have sync_proto_sources_dir as a prefix in them. Were
you concerned about early/late expansion of the variables since it's an indirect
usage of it?

[Nicolas Zea, 2015/04/09 21:59:56]

Right, it wasn't clear to me when the actual expansion would take place. But if
it works then I guess this is right.

[pval...(no longer on Chromium), 2015/04/09 22:04:20]

ah, I misread the question. I believe it happens in the right order (given its
current functionality).

+              ],
+            },
+          ],
+          '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',