Cleanup remoting.gyp around the remoting_webapp target

Added two new targets remoting_webapp_v1 and remoting_webapp_v2. Both
include the new remoting_webapp.gypi. remoting_webapp target
depends on both. Also moved these targets to remoting_client.gypi.
remoting_webapp.gypi will also be reused for webapp version that
uses PNaCl plugin.

BUG=276739

Review URL: https://codereview.chromium.org/181473008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253800 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 5 deletions

diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py
index 42e941c..df4c56f 100755
--- a/remoting/webapp/build-webapp.py
+++ b/remoting/webapp/build-webapp.py
@@ -306,10 +306,10 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
 
 
 def main():
-  if len(sys.argv) < 7:
+  if len(sys.argv) < 6:
     print ('Usage: build-webapp.py '
-           '<build-type> <version> <mime-type> <dst> <zip-path> <plugin> '
-           '<other files...> [--patches <patches...>] '
+           '<build-type> <version> <mime-type> <dst> <zip-path> '
+           '<other files...> [--plugin <plugin>] [--patches <patches...>] '
            '[--locales <locales...>]')
     return 1
 
@@ -317,18 +317,22 @@ def main():
   files = []
   locales = []
   patches = []
+  plugin = ""
   for arg in sys.argv[7:]:
-    if arg == '--locales' or arg == '--patches':
+    if arg in ['--locales', '--patches', '--plugin']:
       arg_type = arg
     elif arg_type == '--locales':
       locales.append(arg)
     elif arg_type == '--patches':
       patches.append(arg)
+    elif arg_type == '--plugin':
+      plugin = arg
+      arg_type = ''
     else:
       files.append(arg)
 
   return buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4],
-                     sys.argv[5], sys.argv[6], files, locales, patches)
+                     sys.argv[5], plugin, files, locales, patches)
 
 
 if __name__ == '__main__':