| Index: runtime/bin/bin.gypi | 
| diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi | 
| index 49c0cb706996b4396d2f95cee42bf594de926a71..1da5912ce4aee5c02d14ab441679f1107e149a86 100644 | 
| --- a/runtime/bin/bin.gypi | 
| +++ b/runtime/bin/bin.gypi | 
| @@ -18,6 +18,8 @@ | 
| 'bootstrap_resources_cc_file': | 
| '<(gen_source_dir)/bootstrap_resources_gen.cc', | 
| 'snapshot_cc_file': '<(gen_source_dir)/snapshot_gen.cc', | 
| +    'observatory_assets_cc_file': '<(gen_source_dir)/observatory_assets.cc', | 
| +    'observatory_assets_tar_file': '<(gen_source_dir)/observatory_assets.tar', | 
| }, | 
| 'targets': [ | 
| { | 
| @@ -202,6 +204,7 @@ | 
| 'generate_io_patch_cc_file#host', | 
| 'generate_snapshot_file#host', | 
| 'generate_resources_cc_file#host', | 
| +        'generate_observatory_assets_cc_file#host', | 
| ], | 
| 'sources': [ | 
| 'builtin_common.cc', | 
| @@ -374,6 +377,7 @@ | 
| 'toolsets':['host'], | 
| 'dependencies': [ | 
| 'generate_resources_cc_file#host', | 
| +        'generate_observatory_assets_cc_file#host', | 
| 'libdart_nosnapshot', | 
| 'libdart_builtin', | 
| 'libdart_io', | 
| @@ -477,12 +481,40 @@ | 
| ] | 
| }, | 
| { | 
| -      'target_name': 'generate_resources_cc_file', | 
| +      'target_name': 'generate_observatory_assets_cc_file', | 
| 'type': 'none', | 
| 'toolsets':['host'], | 
| 'dependencies': [ | 
| 'build_observatory#host', | 
| ], | 
| +      'actions': [ | 
| +        { | 
| +          'action_name': 'generate_observatory_assets_cc_file', | 
| +          'inputs': [ | 
| +            '../tools/create_archive.py', | 
| +            '<(PRODUCT_DIR)/observatory/deployed/web/index.html' | 
| +          ], | 
| +          'outputs': [ | 
| +            '<(observatory_assets_cc_file)', | 
| +          ], | 
| +          'action': [ | 
| +            'python', | 
| +            'tools/create_archive.py', | 
| +            '--output', '<(observatory_assets_cc_file)', | 
| +            '--tar_output', '<(observatory_assets_tar_file)', | 
| +            '--outer_namespace', 'dart', | 
| +            '--inner_namespace', 'bin', | 
| +            '--name', 'observatory_assets_archive', | 
| +            '--client_root', '<(PRODUCT_DIR)/observatory/deployed/web/', | 
| +          ], | 
| +          'message': 'Generating ''<(observatory_assets_cc_file)'' file.' | 
| +        }, | 
| +      ] | 
| +    }, | 
| +    { | 
| +      'target_name': 'generate_resources_cc_file', | 
| +      'type': 'none', | 
| +      'toolsets':['host'], | 
| 'includes': [ | 
| 'resources_sources.gypi', | 
| ], | 
| @@ -491,8 +523,6 @@ | 
| 'action_name': 'generate_resources_cc', | 
| 'inputs': [ | 
| '../tools/create_resources.py', | 
| -            # The following two files are used to trigger a rebuild. | 
| -            '<(PRODUCT_DIR)/observatory/deployed/web/index.html', | 
| '<@(_sources)', | 
| ], | 
| 'outputs': [ | 
| @@ -501,13 +531,11 @@ | 
| 'action': [ | 
| 'python', | 
| 'tools/create_resources.py', | 
| -            '--compress', | 
| '--output', '<(resources_cc_file)', | 
| '--outer_namespace', 'dart', | 
| '--inner_namespace', 'bin', | 
| '--table_name', 'service_bin', | 
| '--root_prefix', 'bin/', | 
| -            '--client_root', '<(PRODUCT_DIR)/observatory/deployed/web/', | 
| '<@(_sources)' | 
| ], | 
| 'message': 'Generating ''<(resources_cc_file)'' file.' | 
| @@ -557,6 +585,7 @@ | 
| 'build_observatory#host', | 
| 'generate_snapshot_file#host', | 
| 'generate_resources_cc_file#host', | 
| +        'generate_observatory_assets_cc_file#host', | 
| ], | 
| 'include_dirs': [ | 
| '..', | 
| @@ -572,6 +601,7 @@ | 
| 'vmservice_impl.h', | 
| '<(snapshot_cc_file)', | 
| '<(resources_cc_file)', | 
| +        '<(observatory_assets_cc_file)', | 
| ], | 
| 'conditions': [ | 
| ['OS=="win"', { | 
| @@ -626,6 +656,7 @@ | 
| '<(io_cc_file)', | 
| '<(io_patch_cc_file)', | 
| '<(bootstrap_resources_cc_file)', | 
| +        'observatory_assets_empty.cc', | 
| 'snapshot_empty.cc', | 
| ], | 
| 'conditions': [ | 
| @@ -661,6 +692,7 @@ | 
| 'libdart_builtin', | 
| 'libdart_io', | 
| 'generate_resources_cc_file#host', | 
| +        'generate_observatory_assets_cc_file#host', | 
| ], | 
| 'include_dirs': [ | 
| '..', | 
| @@ -679,6 +711,7 @@ | 
| '<(io_cc_file)', | 
| '<(io_patch_cc_file)', | 
| '<(resources_cc_file)', | 
| +        '<(observatory_assets_cc_file)', | 
| 'snapshot_empty.cc', | 
| ], | 
| 'conditions': [ | 
|  |