Fix check for MojoShell.apk

Fix check for MojoShell.apk

R=eseidel@chromium.org

Committed: https://chromium.googlesource.com/external/mojo/+/95dc0c3494fdd4e8ef767fcf03a22f5bb166094f

[DaveMoore, 2015-04-21 17:12:01]

davemoore@chromium.org changed reviewers:
+ eseidel@chromium.org

[DaveMoore, 2015-04-21 17:12:02]

This check was failing on fresh builds because it was looking for mojo_shell but
installing MojoShell.apk

[eseidel, 2015-04-21 17:18:28]

Regardless, lgtm.

https://codereview.chromium.org/1097343002/diff/1/sky/tools/skydb
File sky/tools/skydb (right):

https://codereview.chromium.org/1097343002/diff/1/sky/tools/skydb#newcode183
sky/tools/skydb:183: if is_android:
I would have moved this into a helper function and made the path-computation
conditionalized on the if and shared the print/exit block.

Then the outer caller just looks like:

if not self._validate_build_dir(self.paths.build_dir, is_android):
   sys.exit(2)

def _validate_build_dir(self, build_dir, is_android):
   if is_android:
      apk_path...
      executable_path = ...
   else:
      executable_path = ...
   if os.path.exists(mojo_shell_path):
      return True
   print "%s not found in %s % (os.path.basename(executable_path),
os.path.dirname(executable_path))
   ....
   return false.

[DaveMoore, 2015-04-22 03:42:17]

Minor fixup

[DaveMoore, 2015-04-22 03:58:22]

Committed patchset #2 (id:20001) manually as
95dc0c3494fdd4e8ef767fcf03a22f5bb166094f (presubmit successful).