mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java - Issue 1130763004: Gets mandoline working on android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java

Issue 1130763004: Gets mandoline working on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get windows working Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« components/html_viewer/html_viewer.cc ('K') | « mojo/runner/android/apk/AndroidManifest.xml ('k') | mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java » ('j') | mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java

diff --git a/mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java b/mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java

index c455251559f35f3d5cece6872935792b9878cedb..a4960921cd864566b86785f0d886e4330d610b88 100644

--- a/mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java

+++ b/mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java

@@ -97,10 +97,11 @@ class FileHelper {

String suffix = "-" + assetName;

outputFile = File.createTempFile(TEMP_FILE_PREFIX, suffix, outputDirectory);

} else {

- outputFile = new File(outputDirectory, assetName);

+ outputFile = new File(outputDirectory.getPath() + File.separator + assetName);

Jay Civelli 2015/05/11 21:07:34 This looks equivalent to what is was before. Do yo

sky 2015/05/11 21:13:35 Done.

if (outputFile.exists()) {

return outputFile;

}

+ outputFile.getParentFile().mkdirs();

}

BufferedInputStream inputStream = new BufferedInputStream(