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..deab735016f0d9fd7dfe08595e6a58323eaefa0e 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -469,6 +469,184 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # before submit:
+          # add a lot of documentation here!
+          'target_name': 'sync_prepare_protos_for_java_tests',
+          'type': 'none',
+          'actions': [
+            {
+              'action_name': 'run_script',
+              'variables': {
+                'sync_protos': [
+                  # before submit:
+                  # Can we simply reference the sync_proto target sources
+                  # instead of duplicating this list?

[pval...(no longer on Chromium), 2015/03/13 00:32:45]

?

[nyquist, 2015/03/24 00:25:36]

Yeah, I think if you split that out into its own list, you can re-use the list
of files. We do that for example for sharing file lists between GYP and GN.

[pval...(no longer on Chromium), 2015/03/26 21:17:57]

fixed in sync/sync.gyp.

+                  'protocol/sync.proto',
+                  'protocol/app_notification_specifics.proto',
+                  'protocol/app_setting_specifics.proto',
+                  'protocol/app_specifics.proto',
+                  'protocol/app_list_specifics.proto',
+                  'protocol/article_specifics.proto',
+                  'protocol/attachments.proto',
+                  'protocol/autofill_specifics.proto',
+                  'protocol/bookmark_specifics.proto',
+                  'protocol/client_commands.proto',
+                  'protocol/client_debug_info.proto',
+                  'protocol/device_info_specifics.proto',
+                  'protocol/dictionary_specifics.proto',
+                  'protocol/encryption.proto',
+                  'protocol/experiment_status.proto',
+                  'protocol/experiments_specifics.proto',
+                  'protocol/extension_setting_specifics.proto',
+                  'protocol/extension_specifics.proto',
+                  'protocol/favicon_image_specifics.proto',
+                  'protocol/favicon_tracking_specifics.proto',
+                  'protocol/get_updates_caller_info.proto',
+                  'protocol/history_delete_directive_specifics.proto',
+                  'protocol/nigori_specifics.proto',
+                  'protocol/managed_user_setting_specifics.proto',
+                  'protocol/managed_user_shared_setting_specifics.proto',
+                  'protocol/managed_user_specifics.proto',
+                  'protocol/managed_user_whitelist_specifics.proto',
+                  'protocol/password_specifics.proto',
+                  'protocol/preference_specifics.proto',
+                  'protocol/priority_preference_specifics.proto',
+                  'protocol/search_engine_specifics.proto',
+                  'protocol/session_specifics.proto',
+                  'protocol/sync.proto',
+                  'protocol/sync_enums.proto',
+                  'protocol/synced_notification_app_info_specifics.proto',
+                  'protocol/synced_notification_specifics.proto',
+                  'protocol/test.proto',
+                  'protocol/theme_specifics.proto',
+                  'protocol/typed_url_specifics.proto',
+                  'protocol/unique_position.proto',
+                  'protocol/wifi_credential_specifics.proto',
+                ],
+              },
+              'inputs': [
+                'protocol/prepare_protos_for_java_tests.py',
+                '<@(sync_protos)',
+              ],
+              'outputs': [
+                # before submit:
+                # How can we autogenerate this list?

[pval...(no longer on Chromium), 2015/03/13 00:32:45]

?

I think this could go away if sync_prepare_protos_for_java_tests and
test_support_sync_proto_java were part of the same target. See question below
about that.

+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/sync.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_notification_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_setting_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_list_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/article_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/attachments.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/autofill_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/bookmark_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/client_commands.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/client_debug_info.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/device_info_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/dictionary_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/encryption.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/experiment_status.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/experiments_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/extension_setting_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/extension_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/favicon_image_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/favicon_tracking_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/get_updates_caller_info.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/history_delete_directive_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/nigori_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_setting_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_shared_setting_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_whitelist_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/password_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/preference_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/priority_preference_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/search_engine_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/session_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/sync.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/sync_enums.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/synced_notification_app_info_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/synced_notification_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/test.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/theme_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/typed_url_specifics.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/unique_position.proto',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos/wifi_credential_specifics.proto',
+              ],
+              'action': [
+                'python',
+                'protocol/prepare_protos_for_java_tests.py',
+                '--output_dir',
+                '<(SHARED_INTERMEDIATE_DIR)/sync_protos',
+                '<@(sync_protos)'
+              ],
+            },
+          ],
+        },
+        {
+          # before submit:
+          # create GN version
+          'target_name': 'test_support_sync_proto_java',
+          'type': 'none',
+          'dependencies': [
+            # before submit:
+            # can't make the other action part of this target because it needs
+            # to execute first (before the protoc_java actions). is there any
+            # way to do this? this would allow use of INTERMEDIATE_DIR instead
+            # of SHARED_INTERMEDIATE_DIR because it could be in a single target.

[pval...(no longer on Chromium), 2015/03/13 00:32:45]

?

I couldn't figure out how to force ordering of actions. protoc_java.gypi defines
its own actions (compile the protos), but I need my actions to run first.

[nyquist, 2015/03/24 00:25:36]

Yeah, I'm unsure if you can easily order actions in GYP. I've done similar
"action-as-target" tricks other places at least.

[nyquist, 2015/03/24 01:16:54]

Oh, by the way. Ordering between actions should work correctly if you have your
inputs and outputs correctly set. That should enforce ordering.

[pval...(no longer on Chromium), 2015/03/26 21:17:57]

The targers have been merged by properly defining inputs/outputs.

+            'sync_prepare_protos_for_java_tests',
+          ],
+          'sources': [
+            # before submit:
+            # How can we autogenerate this list?

[pval...(no longer on Chromium), 2015/03/13 00:32:45]

?

Similar to above, I think this could be removed if all work is done in the same
target.

[nyquist, 2015/03/24 00:25:36]

In GN you could use 'process_file_template' to generate this, or use foreach (if
process_file_template doesn't work).

For GYP, you could move the whole list into a .gypi-file with a prefix.
So in your gpi
<(PREFIX)/sync.proto
<(PREFIX)/app_notification_specifics.proto
...

Then, inside the variable block in each action, you'd set the prefix correctly
for that action, and then you'd include the .gypi where you want the list.

[pval...(no longer on Chromium), 2015/03/26 21:17:57]

Added a sync/protocol/protocol.gypi to accomplish this.

+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/sync.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_notification_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_setting_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/app_list_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/article_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/attachments.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/autofill_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/bookmark_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/client_commands.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/client_debug_info.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/device_info_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/dictionary_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/encryption.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/experiment_status.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/experiments_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/extension_setting_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/extension_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/favicon_image_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/favicon_tracking_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/get_updates_caller_info.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/history_delete_directive_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/nigori_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_setting_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_shared_setting_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/managed_user_whitelist_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/password_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/preference_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/priority_preference_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/search_engine_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/session_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/sync.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/sync_enums.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/synced_notification_app_info_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/synced_notification_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/test.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/theme_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/typed_url_specifics.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/unique_position.proto',
+            '<(SHARED_INTERMEDIATE_DIR)/sync_protos/wifi_credential_specifics.proto',
+          ],
+          'variables': {
+            'proto_in_dir': '<(SHARED_INTERMEDIATE_DIR)/sync_protos',
+          },
+          'includes': ['../build/protoc_java.gypi'],
+        },
+        {
           # GN: //sync:test_support_sync_fake_server_android
           'target_name': 'test_support_sync_fake_server_android',
           'type': 'static_library',