Revert of Cleanup remoting.gyp around the remoting_webapp target (https://codereview.chromium.org/181473008/)

Reason for revert:
Appears to have broken the build:

http://build.chromium.org/p/chromium/builders/Linux/builds/47807

...
  adding: chrome-linux/chrome (deflated 58%)
Traceback (most recent call last):
  File "../../../scripts/slave/chromium/archive_build.py", line 760, in <module>
chromium_utils.CopyFileToDir(src/out/Release/remoting-webapp.v2.zip, /b/build/slave/Linux/chrome_staging/, dest_fn=remoting-webapp.v2.zip)
    sys.exit(main(None))
  File "../../../scripts/slave/chromium/archive_build.py", line 756, in main
    return s.ArchiveBuild()
  File "../../../scripts/slave/chromium/archive_build.py", line 571, in ArchiveBuild
    os.path.join(self._staging_dir, stage_subdir), dest_fn=stage_fn)
  File "/b/build/scripts/common/chromium_utils.py", line 485, in CopyFileToDir
    raise PathNotFound('Unable to find file %s' % src_path)
common.chromium_utils.PathNotFound: Unable to find file src/out/Release/remoting-webapp.v2.zip

Original issue's description:
> 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
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=253800

TBR=jamiewalch@chromium.org,garykac@chromium.org,sergeyu@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=276739

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

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

1 files changed, 5 insertions, 9 deletions

diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py
index df4c56f..42e941c 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) < 6:
+  if len(sys.argv) < 7:
     print ('Usage: build-webapp.py '
-           '<build-type> <version> <mime-type> <dst> <zip-path> '
-           '<other files...> [--plugin <plugin>] [--patches <patches...>] '
+           '<build-type> <version> <mime-type> <dst> <zip-path> <plugin> '
+           '<other files...> [--patches <patches...>] '
            '[--locales <locales...>]')
     return 1
 
@@ -317,22 +317,18 @@ def main():
   files = []
   locales = []
   patches = []
-  plugin = ""
   for arg in sys.argv[7:]:
-    if arg in ['--locales', '--patches', '--plugin']:
+    if arg == '--locales' or arg == '--patches':
       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], plugin, files, locales, patches)
+                     sys.argv[5], sys.argv[6], files, locales, patches)
 
 
 if __name__ == '__main__':