Skip to content

GitLab

T
tangled
Commit f8e12998 authored by sky's avatar sky Committed by Commit bot
Browse files
Options

Revert of Changes caching logic of mojo java apps (patchset #5 id:80001 of... 

Revert of Changes caching logic of mojo java apps (patchset #5 id:80001 of https://codereview.chromium.org/1149813002/)

Reason for revert:
Broke windows build.

Original issue's description:
> Changes caching logic of mojo java apps
>
> Previously we would extract all necessary files every time we ran the
> app. This is obviously unnecessary for any bundled apps. Now we
> extract only as necessary.
>
> R=ben@chromium.org, jcivelli@chromium.org
> BUG=none
> TEST=none
>
> Committed: https://crrev.com/128f7a0181634a89a35f681baab1d086d100e377
> Cr-Commit-Position: refs/heads/master@{#330824}

TBR=ben@chromium.org,jcivelli@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

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

Cr-Commit-Position: refs/heads/master@{#330832}
parent 11433b24
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 354 deletions
mojo/runner/android/android_handler.cc
View file @ f8e12998
......@@ -15,8 +15,6 @@
#include "mojo/public/c/system/main.h"
#include "mojo/runner/android/run_android_application_function.h"
#include "mojo/runner/native_application_support.h"
#include "mojo/util/filename_util.h"
#include "url/gurl.h"
using base::android::AttachCurrentThread;
using base::android::ScopedJavaLocalRef;
......@@ -36,17 +34,15 @@ namespace {
void RunAndroidApplication(JNIEnv* env,
jobject j_context,
const base::FilePath& app_path,
jint j_handle,
bool is_cached_app) {
jint j_handle) {
InterfaceRequest<Application> application_request =
MakeRequest<Application>(MakeScopedHandle(MessagePipeHandle(j_handle)));
// Load the library, so that we can set the application context there if
// needed.
// TODO(vtl): We'd use a ScopedNativeLibrary, but it doesn't have .get()!
base::NativeLibrary app_library = LoadNativeApplication(
app_path, is_cached_app ? shell::NativeApplicationCleanup::DONT_DELETE
: shell::NativeApplicationCleanup::DELETE);
base::NativeLibrary app_library =
LoadNativeApplication(app_path, shell::NativeApplicationCleanup::DELETE);
if (!app_library)
return;
......@@ -73,57 +69,6 @@ void RunAndroidApplication(JNIEnv* env,
base::UnloadNativeLibrary(app_library);
}
// Returns true if |url| denotes a cached app. If true |app_dir| is set to the
// path of the directory for the app and |path_to_mojo| the path of the app's
// .mojo file.
bool IsCachedApp(JNIEnv* env,
const GURL& url,
base::FilePath* app_dir,
base::FilePath* path_to_mojo) {
ScopedJavaLocalRef<jstring> j_local_apps_dir =
Java_AndroidHandler_getLocalAppsDir(env, GetApplicationContext());
const base::FilePath local_apps_fp(
ConvertJavaStringToUTF8(env, j_local_apps_dir.obj()));
const std::string local_apps(util::FilePathToFileURL(local_apps_fp).spec());
const std::string response_url(GURL(url).spec());
if (response_url.size() <= local_apps.size() ||
local_apps.compare(0u, local_apps.size(), response_url, 0u,
local_apps.size()) != 0) {
return false;
}
const std::string mojo_suffix(".mojo");
// app_rel_path is either something like html_viewer/html_viewer.mojo, or
// html_viewer.mojo, depending upon whether the app has a package.
const std::string app_rel_path(response_url.substr(local_apps.size() + 1));
const size_t slash_index = app_rel_path.find('/');
if (slash_index != std::string::npos) {
const std::string tail =
app_rel_path.substr(slash_index + 1, std::string::npos);
const std::string head = app_rel_path.substr(0, slash_index);
if (head.find('/') != std::string::npos ||
tail.size() <= mojo_suffix.size() ||
tail.compare(tail.size() - mojo_suffix.size(), tail.size(),
mojo_suffix) != 0) {
return false;
}
*app_dir = local_apps_fp.Append(head);
*path_to_mojo = app_dir->Append(tail);
return true;
}
if (app_rel_path.find('/') != std::string::npos ||
app_rel_path.size() <= mojo_suffix.size() ||
app_rel_path.compare(app_rel_path.size() - mojo_suffix.size(),
mojo_suffix.size(), mojo_suffix) != 0) {
return false;
}
*app_dir = local_apps_fp.Append(
app_rel_path.substr(0, app_rel_path.size() - mojo_suffix.size()));
*path_to_mojo = local_apps_fp.Append(app_rel_path);
return true;
}
} // namespace
AndroidHandler::AndroidHandler() : content_handler_factory_(this) {
......@@ -136,30 +81,13 @@ void AndroidHandler::RunApplication(
InterfaceRequest<Application> application_request,
URLResponsePtr response) {
JNIEnv* env = AttachCurrentThread();
RunAndroidApplicationFn run_android_application_fn = &RunAndroidApplication;
if (!response->url.is_null()) {
base::FilePath internal_app_path;
base::FilePath path_to_mojo;
if (IsCachedApp(env, GURL(response->url), &internal_app_path,
&path_to_mojo)) {
ScopedJavaLocalRef<jstring> j_internal_app_path(
ConvertUTF8ToJavaString(env, internal_app_path.value()));
ScopedJavaLocalRef<jstring> j_path_to_mojo(
ConvertUTF8ToJavaString(env, path_to_mojo.value()));
Java_AndroidHandler_bootstrapCachedApp(
env, GetApplicationContext(), j_path_to_mojo.obj(),
j_internal_app_path.obj(),
application_request.PassMessagePipe().release().value(),
reinterpret_cast<jlong>(run_android_application_fn));
return;
}
}
ScopedJavaLocalRef<jstring> j_archive_path =
Java_AndroidHandler_getNewTempArchivePath(env, GetApplicationContext());
base::FilePath archive_path(
ConvertJavaStringToUTF8(env, j_archive_path.obj()));
common::BlockingCopyToFile(response->body.Pass(), archive_path);
RunAndroidApplicationFn run_android_application_fn = &RunAndroidApplication;
Java_AndroidHandler_bootstrap(
env, GetApplicationContext(), j_archive_path.obj(),
application_request.PassMessagePipe().release().value(),
......
mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java
View file @ f8e12998
......@@ -5,15 +5,14 @@
package org.chromium.mojo.shell;
import android.content.Context;
import android.util.Log;
import dalvik.system.DexClassLoader;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
import org.chromium.base.Log;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.lang.reflect.Constructor;
......@@ -46,10 +45,6 @@ public class AndroidHandler {
private static final String APP_DIRECTORY = "applications";
private static final String ASSET_DIRECTORY = "assets";
private static final String INTERNAL_DIRECTORY = "internal";
private enum AppType { CACHED, UNCACHED }
/**
* Deletes directories holding the temporary files. This should be called early on shell startup
* to clean up after the previous run.
......@@ -82,158 +77,45 @@ public class AndroidHandler {
@CalledByNative
private static boolean bootstrap(Context context, String archivePath, int handle,
long runApplicationPtr) {
File bootstrapJavaLibrary;
File bootstrapNativeLibrary;
try {
bootstrapJavaLibrary = FileHelper.extractFromAssets(context, BOOTSTRAP_JAVA_LIBRARY,
getAssetDir(context), FileHelper.FileType.TEMPORARY);
bootstrapNativeLibrary = FileHelper.extractFromAssets(context, BOOTSTRAP_NATIVE_LIBRARY,
getAssetDir(context), FileHelper.FileType.TEMPORARY);
} catch (Exception e) {
Log.e(TAG, "Extraction of bootstrap files from assets failed.", e);
return false;
}
File applicationJavaLibrary;
File applicationNativeLibrary;
try {
File archive = new File(archivePath);
applicationJavaLibrary =
FileHelper.extractFromArchive(archive, JAVA_LIBRARY_SUFFIX, getAppDir(context),
FileHelper.FileType.TEMPORARY, FileHelper.ArchiveType.NORMAL);
applicationNativeLibrary = FileHelper.extractFromArchive(archive, NATIVE_LIBRARY_SUFFIX,
getAppDir(context), FileHelper.FileType.TEMPORARY,
FileHelper.ArchiveType.NORMAL);
} catch (Exception e) {
Log.e(TAG, "Extraction of application files from the archive failed.", e);
return false;
}
return runApp(context, getDexOutputDir(context), applicationJavaLibrary,
applicationNativeLibrary, bootstrapJavaLibrary, bootstrapNativeLibrary, handle,
runApplicationPtr, AppType.UNCACHED);
}
private static File findFileInDirectoryMatchingSuffix(
File dir, final String suffix, final String ignore) {
File[] matchingFiles = dir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return !name.equals(ignore) && !name.equals(BOOTSTRAP_JAVA_LIBRARY)
&& !name.equals(BOOTSTRAP_NATIVE_LIBRARY) && name.endsWith(suffix);
}
});
return matchingFiles != null && matchingFiles.length == 1 ? matchingFiles[0] : null;
}
/**
* Extracts and runs a cached application.
*
* @param context the application context
* @param archivePath the path of the archive containing the application to be run
* @param appPathString path where the cached app's resources and other files are
* @param handle handle to the shell to be passed to the native application. On the Java side
* this is opaque payload.
* @param runApplicationPtr pointer to the function that will set the native thunks and call
* into the application MojoMain. On the Java side this is opaque
* payload.
*/
@CalledByNative
private static boolean bootstrapCachedApp(Context context, String archivePath,
String appPathString, int handle, long runApplicationPtr) {
final String appName = new File(appPathString).getName();
final File internalDir = new File(new File(appPathString), INTERNAL_DIRECTORY);
if (!internalDir.exists() && !internalDir.mkdirs()) {
Log.e(TAG, "Unable to create output dir " + internalDir.getAbsolutePath());
return false;
}
final File timestamp = FileHelper.prepareDirectoryForAssets(context, internalDir);
// We make the bootstrap library have a unique name on disk as otherwise we end up sharing
// bootstrap.so,
// which doesn't work.
// TODO(sky): figure out why android is caching the names.
final String bootstrapNativeLibraryName = appName + "-" + BOOTSTRAP_NATIVE_LIBRARY;
File bootstrapJavaLibrary = new File(internalDir, BOOTSTRAP_JAVA_LIBRARY);
File bootstrapNativeLibrary = new File(internalDir, bootstrapNativeLibraryName);
File bootstrap_java_library;
File bootstrap_native_library;
try {
// Use the files on disk if we have them, if not extract from the archive.
if (!bootstrapJavaLibrary.exists()) {
bootstrapJavaLibrary = FileHelper.extractFromAssets(context, BOOTSTRAP_JAVA_LIBRARY,
internalDir, FileHelper.FileType.PERMANENT);
}
if (!bootstrapNativeLibrary.exists()) {
final File extractedBootstrapNativeLibrary = FileHelper.extractFromAssets(context,
BOOTSTRAP_NATIVE_LIBRARY, internalDir, FileHelper.FileType.PERMANENT);
if (!extractedBootstrapNativeLibrary.renameTo(bootstrapNativeLibrary)) {
Log.e(TAG, "Unable to rename bootstrap library "
+ bootstrapNativeLibrary.getAbsolutePath());
return false;
}
}
bootstrap_java_library = FileHelper.extractFromAssets(context, BOOTSTRAP_JAVA_LIBRARY,
getAssetDir(context), true);
bootstrap_native_library = FileHelper.extractFromAssets(context,
BOOTSTRAP_NATIVE_LIBRARY, getAssetDir(context), true);
} catch (Exception e) {
Log.e(TAG, "Extraction of bootstrap files from assets failed.", e);
return false;
}
// Because we allow the .so and .dex.jar to be anything we have to search in the internal
// directory for matching files.
// If we find one, we assume it's the one we want.
File applicationJavaLibrary =
findFileInDirectoryMatchingSuffix(internalDir, JAVA_LIBRARY_SUFFIX, "");
File applicationNativeLibrary = findFileInDirectoryMatchingSuffix(
internalDir, NATIVE_LIBRARY_SUFFIX, bootstrapNativeLibraryName);
File application_java_library;
File application_native_library;
try {
File archive = new File(archivePath);
if (applicationJavaLibrary == null) {
applicationJavaLibrary = FileHelper.extractFromArchive(archive, JAVA_LIBRARY_SUFFIX,
internalDir, FileHelper.FileType.PERMANENT,
FileHelper.ArchiveType.CONTENT_HANDLER);
}
if (applicationNativeLibrary == null) {
applicationNativeLibrary = FileHelper.extractFromArchive(archive,
NATIVE_LIBRARY_SUFFIX, internalDir, FileHelper.FileType.PERMANENT,
FileHelper.ArchiveType.CONTENT_HANDLER);
}
application_java_library = FileHelper.extractFromArchive(archive, JAVA_LIBRARY_SUFFIX,
getAppDir(context));
application_native_library = FileHelper.extractFromArchive(archive,
NATIVE_LIBRARY_SUFFIX, getAppDir(context));
} catch (Exception e) {
Log.e(TAG, "Extraction of application files from the archive failed.", e);
return false;
}
FileHelper.createTimestampIfNecessary(timestamp);
return runApp(context, new File(internalDir, DEX_OUTPUT_DIRECTORY), applicationJavaLibrary,
applicationNativeLibrary, bootstrapJavaLibrary, bootstrapNativeLibrary, handle,
runApplicationPtr, AppType.CACHED);
}
/**
* Creates the class loader containing the bootstrap classes and runs it.
*
* @return true if successfully ran, false if encounteres some sort of error.
*/
private static boolean runApp(Context context, File dexOutputDir, File applicationJavaLibrary,
File applicationNativeLibrary, File bootstrapJavaLibrary, File bootstrapNativeLibrary,
int handle, long runApplicationPtr, AppType appType) {
final String dexPath = bootstrapJavaLibrary.getAbsolutePath() + File.pathSeparator
+ applicationJavaLibrary.getAbsolutePath();
if (!dexOutputDir.exists() && !dexOutputDir.mkdirs()) {
Log.e(TAG, "Unable to create dex output dir " + dexOutputDir.getAbsolutePath());
return false;
}
// TODO(sky): third arg is a path, but appears to have no effect, figure out if this relates
// to weird caching
// logic mentioned above.
DexClassLoader bootstrapLoader = new DexClassLoader(
dexPath, dexOutputDir.getAbsolutePath(), null, ClassLoader.getSystemClassLoader());
String dexPath = bootstrap_java_library.getAbsolutePath() + File.pathSeparator
+ application_java_library.getAbsolutePath();
DexClassLoader bootstrapLoader = new DexClassLoader(dexPath,
getDexOutputDir(context).getAbsolutePath(), null,
ClassLoader.getSystemClassLoader());
try {
Class<?> loadedClass = bootstrapLoader.loadClass(BOOTSTRAP_CLASS);
Class<? extends Runnable> bootstrapClass = loadedClass.asSubclass(Runnable.class);
Constructor<? extends Runnable> constructor =
bootstrapClass.getConstructor(Context.class, File.class, File.class,
Integer.class, Long.class, Boolean.class);
Runnable bootstrapRunnable = constructor.newInstance(context, bootstrapNativeLibrary,
applicationNativeLibrary, Integer.valueOf(handle),
Long.valueOf(runApplicationPtr), appType == AppType.CACHED);
Constructor<? extends Runnable> constructor = bootstrapClass.getConstructor(
Context.class, File.class, File.class, Integer.class, Long.class);
Runnable bootstrapRunnable = constructor.newInstance(context, bootstrap_native_library,
application_native_library, Integer.valueOf(handle),
Long.valueOf(runApplicationPtr));
bootstrapRunnable.run();
} catch (Throwable t) {
Log.e(TAG, "Running Bootstrap failed.", t);
......@@ -242,11 +124,6 @@ public class AndroidHandler {
return true;
}
@CalledByNative
static String getLocalAppsDir(Context context) {
return ShellMain.getLocalAppsDir(context).getAbsolutePath();
}
private static File getDexOutputDir(Context context) {
return context.getDir(DEX_OUTPUT_DIRECTORY, Context.MODE_PRIVATE);
}
......
mojo/runner/android/apk/src/org/chromium/mojo/shell/Bootstrap.java
View file @ f8e12998
......@@ -22,16 +22,14 @@ public class Bootstrap implements Runnable {
private final File mApplicationNativeLibrary;
private final int mHandle;
private final long mRunApplicationPtr;
private final boolean mIsCachedApp;
public Bootstrap(Context context, File bootstrapNativeLibrary, File applicationNativeLibrary,
Integer handle, Long runApplicationPtr, Boolean isCachedApp) {
Integer handle, Long runApplicationPtr) {
mContext = context;
mBootstrapNativeLibrary = bootstrapNativeLibrary;
mApplicationNativeLibrary = applicationNativeLibrary;
mHandle = handle;
mRunApplicationPtr = runApplicationPtr;
mIsCachedApp = isCachedApp;
}
@Override
......@@ -39,9 +37,9 @@ public class Bootstrap implements Runnable {
System.load(mBootstrapNativeLibrary.getAbsolutePath());
System.load(mApplicationNativeLibrary.getAbsolutePath());
nativeBootstrap(mContext, mApplicationNativeLibrary.getAbsolutePath(), mHandle,
mRunApplicationPtr, mIsCachedApp);
mRunApplicationPtr);
}
native void nativeBootstrap(Context context, String libraryPath, int handle,
long runApplicationPtr, boolean isCachedApp);
long runApplicationPtr);
}
mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java
View file @ f8e12998
......@@ -7,8 +7,7 @@ package org.chromium.mojo.shell;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import org.chromium.base.Log;
import android.util.Log;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
......@@ -16,6 +15,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
......@@ -35,88 +35,63 @@ class FileHelper {
// Prefix used when naming timestamp files.
private static final String TIMESTAMP_PREFIX = "asset_timestamp-";
/**
* Used to indicate the type of destination file that should be created.
*/
public enum FileType {
TEMPORARY,
PERMANENT,
}
public enum ArchiveType {
/**
* The archive was created for a content handler (contains the mojo escape sequence).
*/
CONTENT_HANDLER,
NORMAL,
}
/**
* Looks for a timestamp file on disk that indicates the version of the APK that the resource
* assets were extracted from. Returns null if a timestamp was found and it indicates that the
* resources match the current APK. Otherwise returns the file to create.
* resources match the current APK. Otherwise returns a String that represents the filename of a
* timestamp to create.
*/
private static File findAssetTimestamp(Context context, File outputDir) {
private static String checkAssetTimestamp(Context context, File outputDir) {
PackageManager pm = context.getPackageManager();
PackageInfo pi = null;
try {
pi = pm.getPackageInfo(context.getPackageName(), 0);
} catch (PackageManager.NameNotFoundException e) {
return TIMESTAMP_PREFIX;
}
if (pi == null) {
return new File(outputDir, TIMESTAMP_PREFIX);
return TIMESTAMP_PREFIX;
}
final File expectedTimestamp =
new File(outputDir, TIMESTAMP_PREFIX + pi.versionCode + "-" + pi.lastUpdateTime);
return expectedTimestamp.exists() ? null : expectedTimestamp;
String expectedTimestamp = TIMESTAMP_PREFIX + pi.versionCode + "-" + pi.lastUpdateTime;
String[] timestamps = outputDir.list(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.startsWith(TIMESTAMP_PREFIX);
}
});
/**
* Invoke prior to extracting any assets into {@code directory}. If necessary deletes all the
* files in the specified directory. The return value must be supplied to {@link
*createTimestampIfNecessary}.
*
* @param directory directory assets will be extracted to
* @return non-null if a file with the specified name needs to be created after assets have
* been extracted.
*/
public static File prepareDirectoryForAssets(Context context, File directory) {
final File timestamp = findAssetTimestamp(context, directory);
if (timestamp == null) {
return null;
if (timestamps.length != 1) {
// If there's no timestamp, nuke to be safe as we can't tell the age of the files.
// If there's multiple timestamps, something's gone wrong so nuke.
return expectedTimestamp;
}
for (File child : directory.listFiles()) {
deleteRecursively(child);
if (!expectedTimestamp.equals(timestamps[0])) {
return expectedTimestamp;
}
return timestamp;
// Timestamp file is already up-to date.
return null;
}
/**
* Creates a file used as a timestamp. The supplied file comes from {@link
*prepareDirectoryForAssets}.
*
* @param timestamp path of file to create, or null if a file does not need to be created
*/
public static void createTimestampIfNecessary(File timestamp) {
if (timestamp == null) {
return;
public static File extractFromAssets(Context context, String assetName, File outputDirectory,
boolean useTempFile) throws IOException, FileNotFoundException {
String timestampToCreate = null;
if (!useTempFile) {
timestampToCreate = checkAssetTimestamp(context, outputDirectory);
if (timestampToCreate != null) {
for (File child : outputDirectory.listFiles()) {
deleteRecursively(child);
}
try {
timestamp.createNewFile();
} catch (IOException e) {
// In the worst case we don't write a timestamp, so we'll re-extract the asset next
// time.
Log.w(TAG, "Failed to write asset timestamp!");
}
}
public static File extractFromAssets(Context context, String assetName, File outputDirectory,
FileType fileType) throws IOException, FileNotFoundException {
File outputFile;
if (fileType == FileType.TEMPORARY) {
if (useTempFile) {
// Make the original filename part of the temp file name.
// TODO(ppi): do we need to sanitize the suffix?
String suffix = "-" + assetName;
......@@ -136,48 +111,36 @@ class FileHelper {
} finally {
inputStream.close();
}
if (timestampToCreate != null) {
try {
new File(outputDirectory, timestampToCreate).createNewFile();
} catch (IOException e) {
// In the worst case we don't write a timestamp, so we'll re-extract the asset next
// time.
Log.w(TAG, "Failed to write asset timestamp!");
}
}
return outputFile;
}
/**
* Extracts the file of the given extension from the archive. Throws FileNotFoundException if no
* matching file is found.
*
* @return path of extracted file
*/
static File extractFromArchive(File archive, String suffixToMatch, File outputDirectory,
FileType fileType, ArchiveType archiveType) throws IOException, FileNotFoundException {
if (!outputDirectory.exists() && !outputDirectory.mkdirs()) {
Log.e(TAG, "extractFromArchive unable to create directory "
+ outputDirectory.getAbsolutePath());
throw new FileNotFoundException();
}
BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(archive));
if (archiveType == ArchiveType.CONTENT_HANDLER) {
int currentChar;
do {
currentChar = inputStream.read();
} while (currentChar != -1 && currentChar != '\n');
if (currentChar == -1) {
throw new FileNotFoundException();
}
inputStream = new BufferedInputStream(inputStream);
}
ZipInputStream zip = new ZipInputStream(inputStream);
static File extractFromArchive(File archive, String suffixToMatch,
File outputDirectory) throws IOException, FileNotFoundException {
ZipInputStream zip = new ZipInputStream(new BufferedInputStream(new FileInputStream(
archive)));
ZipEntry entry;
while ((entry = zip.getNextEntry()) != null) {
if (entry.getName().endsWith(suffixToMatch)) {
// TODO(sky): sanitize name.
final String name = new File(entry.getName()).getName();
File extractedFile;
// Make the original filename part of the temp file name.
if (fileType == FileType.TEMPORARY) {
final String suffix = "-" + name;
extractedFile = File.createTempFile(TEMP_FILE_PREFIX, suffix, outputDirectory);
} else {
extractedFile = new File(outputDirectory, name);
}
// TODO(ppi): do we need to sanitize the suffix?
String suffix = "-" + new File(entry.getName()).getName();
File extractedFile = File.createTempFile(TEMP_FILE_PREFIX, suffix,
outputDirectory);
writeStreamToFile(zip, extractedFile);
zip.close();
return extractedFile;
......
mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java
View file @ f8e12998
......@@ -27,8 +27,7 @@ import java.util.List;
public class ShellMain {
private static final String TAG = "ShellMain";
// Directory where applications cached with the shell will be extracted.
// TODO(sky): rename this to CACHED_APP_DIRECTORY.
// Directory where applications bundled with the shell will be extracted.
private static final String LOCAL_APP_DIRECTORY = "local_apps";
// The mojo_shell library is also an executable run in forked processes when running
// multi-process.
......@@ -73,13 +72,9 @@ public class ShellMain {
if (sInitialized) return;
File localAppsDir = getLocalAppsDir(applicationContext);
try {
final File timestamp =
FileHelper.prepareDirectoryForAssets(applicationContext, localAppsDir);
for (String assetPath : getAssetsList(applicationContext)) {
FileHelper.extractFromAssets(
applicationContext, assetPath, localAppsDir, FileHelper.FileType.PERMANENT);
FileHelper.extractFromAssets(applicationContext, assetPath, localAppsDir, false);
}
FileHelper.createTimestampIfNecessary(timestamp);
File mojoShell = new File(applicationContext.getApplicationInfo().nativeLibraryDir,
MOJO_SHELL_EXECUTABLE);
......@@ -116,7 +111,7 @@ public class ShellMain {
nativeAddApplicationURL(url);
}
static File getLocalAppsDir(Context context) {
private static File getLocalAppsDir(Context context) {
return context.getDir(LOCAL_APP_DIRECTORY, Context.MODE_PRIVATE);
}
......@@ -133,7 +128,7 @@ public class ShellMain {
* Initializes the native system. This API should be called only once per process.
**/
private static native void nativeInit(Context context, String mojoShellPath,
String[] parameters, String cachedAppsDirectory, String tmpDir);
String[] parameters, String bundledAppsDirectory, String tmpDir);
private static native boolean nativeStart();
......
mojo/runner/android/bootstrap.cc
View file @ f8e12998
......@@ -17,13 +17,12 @@ void Bootstrap(JNIEnv* env,
jobject j_context,
jstring j_native_library_path,
jint j_handle,
jlong j_run_application_ptr,
jboolean is_cached_app) {
jlong j_run_application_ptr) {
base::FilePath app_path(
base::android::ConvertJavaStringToUTF8(env, j_native_library_path));
RunAndroidApplicationFn run_android_application_fn =
reinterpret_cast<RunAndroidApplicationFn>(j_run_application_ptr);
run_android_application_fn(env, j_context, app_path, j_handle, is_cached_app);
run_android_application_fn(env, j_context, app_path, j_handle);
}
bool RegisterBootstrapJni(JNIEnv* env) {
......
mojo/runner/android/run_android_application_function.h
View file @ f8e12998
......@@ -19,8 +19,7 @@ namespace runner {
typedef void (*RunAndroidApplicationFn)(JNIEnv* env,
jobject j_context,
const base::FilePath& app_path,
jint j_handle,
bool is_cached_app);
jint j_handle);
} // namespace runner
} // namespace mojo
......
mojo/runner/android/tests/src/org/chromium/mojo/shell/ShellTestBase.java
View file @ f8e12998
......@@ -31,8 +31,7 @@ public class ShellTestBase {
AssetManager manager = context.getResources().getAssets();
for (String asset : manager.list("")) {
if (asset.endsWith(".mojo")) {
FileHelper.extractFromAssets(
context, asset, outputDirectory, FileHelper.FileType.PERMANENT);
FileHelper.extractFromAssets(context, asset, outputDirectory, false);
}
}
......
mojo/runner/url_resolver.cc
View file @ f8e12998
......@@ -114,14 +114,10 @@ GURL URLResolver::ResolveMojoURL(const GURL& mojo_url) const {
if (mojo_base_url_.SchemeIsFile()) {
const GURL url_with_directory(
mojo_base_url_.Resolve(base_url.host() + "/"));
const base::FilePath dir(util::UrlToFilePath(url_with_directory));
if (base::DirectoryExists(dir)) {
const base::FilePath mojo_path = dir.Append(base_url.host() + ".mojo");
// Only use the directory if the .mojo exists in the directory.
if (base::PathExists(mojo_path))
const base::FilePath file_path(util::UrlToFilePath(url_with_directory));
if (base::DirectoryExists(file_path))
return url_with_directory.Resolve(base_url.host() + ".mojo" + query);
}
}
return mojo_base_url_.Resolve(base_url.host() + ".mojo" + query);
}
......
mojo/runner/url_resolver_unittest.cc
View file @ f8e12998
......@@ -159,23 +159,13 @@ TEST_F(URLResolverTest, PreferDirectory) {
EXPECT_EQ(util::FilePathToFileURL(tmp_dir.path()).spec() + "/foo.mojo",
mapped_url.spec());
// With an empty directory |mojo:foo| maps to path/foo.mojo.
// With a directory |mojo:foo| maps to path/foo/foo.mojo.
const base::FilePath foo_file_path(
tmp_dir.path().Append(FILE_PATH_LITERAL("foo")));
ASSERT_TRUE(base::CreateDirectory(foo_file_path));
const GURL mapped_url_with_dir = resolver.ResolveMojoURL(GURL("mojo:foo"));
EXPECT_EQ(util::FilePathToFileURL(tmp_dir.path()).spec() + "/foo.mojo",
mapped_url_with_dir.spec());
// When foo.mojo exists in the directory (path/foo/foo.mojo), then it should
// be picked up.
// With an empty directory |mojo:foo| maps to path/foo/foo.mojo.
ASSERT_EQ(1,
base::WriteFile(foo_file_path.Append(FILE_PATH_LITERAL("foo.mojo")),
"a", 1));
const GURL mapped_url_in_dir = resolver.ResolveMojoURL(GURL("mojo:foo"));
EXPECT_EQ(util::FilePathToFileURL(tmp_dir.path()).spec() + "/foo/foo.mojo",
mapped_url_in_dir.spec());
mapped_url_with_dir.spec());
}
} // namespace
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment