Index: remoting/app_remoting_webapp.gyp |
diff --git a/remoting/app_remoting_webapp.gyp b/remoting/app_remoting_webapp.gyp |
index fad6f428f1a8e6b97b49d804fe0a417f192c85b7..b5fe64ade945aebcd0ed71d4ea8e109af4b6f8c8 100644 |
--- a/remoting/app_remoting_webapp.gyp |
+++ b/remoting/app_remoting_webapp.gyp |
@@ -7,97 +7,17 @@ |
'../remoting/remoting_locales.gypi', |
'../remoting/app_remoting_webapp_build.gypi', |
], |
- |
'target_defaults': { |
'variables': { |
'ar_internal': 0, |
- 'compiler_flags': [ |
- '--strict', |
- '--no-single-file', |
- '--externs', |
- '../third_party/closure_compiler/externs/chrome_extensions.js', |
- ], |
}, |
- |
- 'conditions': [ |
- ['run_jscompile != 0', { |
- 'actions': [ |
- { |
- 'action_name': 'Verify >(ar_app_name) main.html', |
- 'variables': { |
- 'success_stamp': '<(PRODUCT_DIR)/>(_target_name)_main_jscompile.stamp', |
- }, |
- 'inputs': [ |
- '<@(ar_main_js_files)', |
- '<@(remoting_webapp_js_proto_files)', |
- # Include zip as input so that this action is run after the build. |
- '<(zip_path)', |
- ], |
- 'outputs': [ |
- '<(success_stamp)', |
- ], |
- 'action': [ |
- 'python', '../third_party/closure_compiler/compile.py', |
- '<@(compiler_flags)', |
- '--success-stamp', '<(success_stamp)', |
- '<@(ar_main_js_files)', |
- '<@(remoting_webapp_js_proto_files)', |
- ], |
- }, |
- { |
- 'action_name': 'Verify >(ar_app_name) background.js', |
- 'variables': { |
- 'success_stamp': '<(PRODUCT_DIR)/>(_target_name)_background_jscompile.stamp', |
- }, |
- 'inputs': [ |
- '<@(ar_background_js_files)', |
- '<@(remoting_webapp_js_proto_files)', |
- # Include zip as input so that this action is run after the build. |
- '<(zip_path)', |
- ], |
- 'outputs': [ |
- '<(success_stamp)', |
- ], |
- 'action': [ |
- 'python', '../third_party/closure_compiler/compile.py', |
- '<@(compiler_flags)', |
- '--success-stamp', '<(success_stamp)', |
- '<@(ar_background_js_files)', |
- '<@(remoting_webapp_js_proto_files)', |
- ], |
- }, |
- { |
- 'action_name': 'Verify >(ar_app_name) feedback_consent.html', |
- 'variables': { |
- 'success_stamp': '<(PRODUCT_DIR)/>(_target_name)_feedback_consent_jscompile.stamp', |
- }, |
- 'inputs': [ |
- '<@(ar_feedback_consent_html_all_js_files)', |
- '<@(remoting_webapp_js_proto_files)', |
- # Include zip as input so that this action is run after the build. |
- '<(zip_path)', |
- ], |
- 'outputs': [ |
- '<(success_stamp)', |
- ], |
- 'action': [ |
- 'python', '../third_party/closure_compiler/compile.py', |
- '<@(compiler_flags)', |
- '--success-stamp', '<(success_stamp)', |
- '<@(ar_feedback_consent_html_all_js_files)', |
- '<@(remoting_webapp_js_proto_files)', |
- ], |
- }, |
- ], # actions |
- }], |
- ], # conditions |
}, |
- |
'targets': [ |
{ |
# GN version: //remoting/webapp:ar_sample_app |
# Sample AppRemoting app. |
'target_name': 'ar_sample_app', |
+ 'type': 'none', |
'app_key': 'Sample_App', |
'app_id': 'ljacajndfccfgnfohlgkdphmbnpkjflk', |
'app_client_id': 'sample_client_id', |
@@ -105,6 +25,17 @@ |
'app_description': 'App Remoting client', |
'app_capabilities': ['GOOGLE_DRIVE'], |
'manifest_key': 'remotingdevbuild', |
+ 'conditions': [ |
+ ['run_jscompile != 0', { |
+ 'dependencies': [ |
+ 'app_remoting_webapp_compile.gypi:*' |
+ ], |
+ }], |
+ ], # conditions |
+# 'inputs': [ |
+# # Include zip as input so that this action is run after the build. |
+# '<(zip_path)', |
+# ], |
}, |
], # end of targets |
} |