Revert "Support uploading Mojo Shell on Android."
This reverts commit 6cf1799caed2b018e545eef1bf499ef5b01ec731.
This breaks uploading the shell on Linux on the bots, e.g.:
http://build.chromium.org/p/client.mojo/builders/Mojo%20Linux/builds/1262/steps/upload%20shell%20binary/logs/stdio
TBR=qsr
Review URL: https://codereview.chromium.org/884133002
diff --git a/mojo/tools/mopy/paths.py b/mojo/tools/mopy/paths.py
index 49e1c50..bade8c0 100644
--- a/mojo/tools/mopy/paths.py
+++ b/mojo/tools/mopy/paths.py
@@ -33,16 +33,9 @@
if Config.GetHostOS() == Config.OS_WINDOWS:
self.mojo_launcher_path += ".exe"
self.mojo_shell_path += ".exe"
- if config and config.target_os == Config.OS_ANDROID:
- self.target_mojo_shell_path = os.path.join(self.build_dir,
- "apks",
- "MojoShell.apk")
- else:
- self.target_mojo_shell_path = self.mojo_shell_path
else:
self.mojo_launcher_path = None
self.mojo_shell_path = None
- self.target_mojo_shell_path = None
def RelPath(self, path):
"""Returns the given path, relative to the current directory."""
diff --git a/mojo/tools/upload_shell_binary.py b/mojo/tools/upload_shell_binary.py
index c7297bb..83c8847 100755
--- a/mojo/tools/upload_shell_binary.py
+++ b/mojo/tools/upload_shell_binary.py
@@ -11,39 +11,31 @@
import time
import zipfile
-import mopy.gn as gn
from mopy.config import Config
from mopy.paths import Paths
from mopy.version import Version
-def upload(config, dry_run, verbose):
- paths = Paths(config)
+paths = Paths(Config(target_os=Config.OS_LINUX, is_debug=False))
- sys.path.insert(0, os.path.join(paths.src_root, "tools"))
- # pylint: disable=F0401
- import find_depot_tools
+sys.path.insert(0, os.path.join(paths.src_root, "tools"))
+# pylint: disable=F0401
+import find_depot_tools
- depot_tools_path = find_depot_tools.add_depot_tools_to_path()
- gsutil_exe = os.path.join(depot_tools_path, "third_party", "gsutil", "gsutil")
+depot_tools_path = find_depot_tools.add_depot_tools_to_path()
+gsutil_exe = os.path.join(depot_tools_path, "third_party", "gsutil", "gsutil")
- zipfile_name = "%s-%s" % (config.target_os, config.target_arch)
- dest = "gs://mojo/shell/" + Version().version + "/" + zipfile_name + ".zip"
+def upload(dry_run, verbose):
+ dest = "gs://mojo/shell/" + Version().version + "/linux-x64.zip"
with tempfile.NamedTemporaryFile() as zip_file:
with zipfile.ZipFile(zip_file, 'w') as z:
- shell_path = paths.target_mojo_shell_path
- with open(shell_path) as shell_binary:
- shell_filename = os.path.basename(shell_path)
- zipinfo = zipfile.ZipInfo(shell_filename)
+ with open(paths.mojo_shell_path) as shell_binary:
+ zipinfo = zipfile.ZipInfo("mojo_shell")
zipinfo.external_attr = 0777 << 16L
- compress_type = zipfile.ZIP_DEFLATED
- if config.target_os == Config.OS_ANDROID:
- # The APK is already compressed.
- compress_type = zipfile.ZIP_STORED
- zipinfo.compress_type = compress_type
- zipinfo.date_time = time.gmtime(os.path.getmtime(shell_path))
+ zipinfo.compress_type = zipfile.ZIP_DEFLATED
+ zipinfo.date_time = time.gmtime(os.path.getmtime(paths.mojo_shell_path))
if verbose:
- print "zipping %s" % shell_path
+ print "zipping %s" % paths.mojo_shell_path
z.writestr(zipinfo, shell_binary.read())
if dry_run:
print str([gsutil_exe, "cp", zip_file.name, dest])
@@ -57,15 +49,8 @@
"upload", action="store_true")
parser.add_argument("-v", "--verbose", help="Verbose mode",
action="store_true")
- parser.add_argument("--build_dir",
- type=str,
- metavar="<build_dir>",
- help="The build dir containing the shell to be uploaded",
- default="out/Release")
args = parser.parse_args()
-
- config = gn.ConfigForGNArgs(gn.ParseGNConfig(args.build_dir))
- upload(config, args.dry_run, args.verbose)
+ upload(args.dry_run, args.verbose)
return 0
if __name__ == "__main__":
