diff options
| -rw-r--r-- | remoting/remoting.gyp | 2 | ||||
| -rw-r--r-- | remoting/webapp/build-webapp.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 429f8ad2..12ace05 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -321,7 +321,7 @@ ], 'action': [ 'python', 'webapp/build-webapp.py', - '<(linux_strip_binary)', + '<(buildtype)', '<(host_plugin_mime_type)', '<(_output_dir)', '<(_zip_path)', diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py index 66a28e7..c73835a 100644 --- a/remoting/webapp/build-webapp.py +++ b/remoting/webapp/build-webapp.py @@ -47,12 +47,12 @@ def createZip(zip_path, directory): zip.close() -def buildWebApp(linux_strip, mimetype, destination, zip_path, plugin, files, +def buildWebApp(buildtype, mimetype, destination, zip_path, plugin, files, locales): """Does the main work of building the webapp directory and zipfile. Args: - linux_strip: should we strip the build on Linux (0 or !0). + buildtype: the type of build ("Official" or "Dev") mimetype: A string with mimetype of plugin. destination: A string with path to directory where the webapp will be written. @@ -152,7 +152,7 @@ def buildWebApp(linux_strip, mimetype, destination, zip_path, plugin, files, shutil.copy2(plugin, newPluginPath) # Strip the linux build. - if ((platform.system() == 'Linux') and (linux_strip != '0')): + if ((platform.system() == 'Linux') and (buildtype == 'Official')): subprocess.call(["strip", newPluginPath]) # Add unique build numbers to manifest version. @@ -181,7 +181,7 @@ def buildWebApp(linux_strip, mimetype, destination, zip_path, plugin, files, def main(): if len(sys.argv) < 6: print ('Usage: build-webapp.py ' - '<linux-strip> <mime-type> <dst> <zip-path> <plugin> ' + '<build-type> <mime-type> <dst> <zip-path> <plugin> ' '<other files...> --locales <locales...>') sys.exit(1) |