| Index: components/devtools_bridge.gyp
|
| diff --git a/components/devtools_bridge.gyp b/components/devtools_bridge.gyp
|
| index a0faaa333fc43acafb97dd8b7c817b60f8137167..4adc31f63910d8c0bd5ebbde7df18e87db6b133b 100644
|
| --- a/components/devtools_bridge.gyp
|
| +++ b/components/devtools_bridge.gyp
|
| @@ -113,14 +113,29 @@
|
| 'type': 'none',
|
| 'dependencies': [
|
| '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
|
| + 'devtools_bridge_client_resources',
|
| ],
|
| 'variables': {
|
| 'asset_location': '<(PRODUCT_DIR)/devtools_bridge_browsertests_apk/assets',
|
| },
|
| 'inputs': [
|
| - '<(PRODUCT_DIR)/chrome_100_percent.pak',
|
| - '<(PRODUCT_DIR)/locales/en-US.pak',
|
| - '<(PRODUCT_DIR)/resources.pak',
|
| + 'devtools_bridge/client/js/client_session.js',
|
| + 'devtools_bridge/client/js/gcd_client.js',
|
| + 'devtools_bridge/client/js/web_client.js',
|
| + 'devtools_bridge/client/web_client.html',
|
| + ],
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'repack_resources',
|
| + 'variables': {
|
| + 'pak_inputs': [
|
| + '<(PRODUCT_DIR)/resources.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/devtools_bridge/web_client_resources.pak',
|
| + ],
|
| + 'pak_output': '<(asset_location)/resources.pak',
|
| + },
|
| + 'includes': [ '../build/repack_action.gypi' ],
|
| + },
|
| ],
|
| 'copies': [
|
| {
|
| @@ -128,7 +143,6 @@
|
| 'files': [
|
| '<(PRODUCT_DIR)/chrome_100_percent.pak',
|
| '<(PRODUCT_DIR)/locales/en-US.pak',
|
| - '<(PRODUCT_DIR)/resources.pak',
|
| ],
|
| 'conditions': [
|
| ['icu_use_data_file_flag==1', {
|
| @@ -173,13 +187,35 @@
|
| 'target_name': 'devtools_bridge_client',
|
| 'type': 'static_library',
|
| 'sources': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/grit/devtools_bridge/web_client_resources_map.cc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/grit/devtools_bridge/web_client_resources_map.h',
|
| 'devtools_bridge/client/web_client.cc',
|
| 'devtools_bridge/client/web_client.h',
|
| + 'devtools_bridge/client/web_client_controller.cc',
|
| + 'devtools_bridge/client/web_client_controller.h',
|
| ],
|
| 'dependencies': [
|
| '<(DEPTH)/base/base.gyp:base',
|
| '<(DEPTH)/content/content.gyp:content',
|
| + 'devtools_bridge_client_resources',
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'devtools_bridge_client_resources',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components',
|
| + },
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'generate_devtools_bridge_client_resources',
|
| + 'variables': {
|
| + 'grit_grd_file': 'devtools_bridge/client/resources.grd',
|
| + },
|
| + 'includes': [ '../build/grit_action.gypi' ],
|
| + },
|
| ],
|
| + 'includes': [ '../build/grit_target.gypi' ],
|
| },
|
| ],
|
| }
|
|
|