diff options
| author | nyquist <nyquist@chromium.org> | 2016-02-18 13:57:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-18 21:58:27 +0000 |
| commit | 4ec5a3218902158763aba8a2008cce34401f40f1 (patch) | |
| tree | 83508a275d1b64716a690cccd7568ae008cd07ea /blimp | |
| parent | 105ec3df8207791e4066b0645340fa7e64163295 (diff) | |
| download | chromium_src-4ec5a3218902158763aba8a2008cce34401f40f1.zip chromium_src-4ec5a3218902158763aba8a2008cce34401f40f1.tar.gz chromium_src-4ec5a3218902158763aba8a2008cce34401f40f1.tar.bz2 | |
Use ResourceEntry instead of mandatory paks for blimp
On earlier versions of Android where Dalvik was selected as the
runtime, the Blimp java tests would fail to run because of an assert.
This fixes running these tests by calling
ResourceExtractor.setResourcesToExtract(...) instead of the deprecated
setMandatoryPaksToExtract(...) method.
Since this was the last caller of setMandatoryPaksToExtract(...), this
CL also removes that method.
In addition, this fixes a minor warning by using Boolean.valueOf(foo)
instead of new Boolean(foo).
BUG=None
Review URL: https://codereview.chromium.org/1711873003
Cr-Commit-Position: refs/heads/master@{#376286}
Diffstat (limited to 'blimp')
| -rw-r--r-- | blimp/client/app/android/java/src/org/chromium/blimp/BlimpApplication.java | 2 | ||||
| -rw-r--r-- | blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpApplication.java b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpApplication.java index 0fb67b9..17fd5fd 100644 --- a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpApplication.java +++ b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpApplication.java @@ -22,7 +22,7 @@ public class BlimpApplication extends BaseChromiumApplication { @Override public void onCreate() { super.onCreate(); - ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAK_FILES); + ResourceExtractor.setResourcesToExtract(new ResourceExtractor.ResourceEntry[0]); PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this); initCommandLine(); } diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java index f4b05ee..3463887 100644 --- a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java +++ b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java @@ -97,7 +97,7 @@ public final class BlimpLibraryLoader { public void run() { // Only run nativeStartBlimp if we properly initialized native. boolean startResult = nativeStartBlimp(); - sLibraryLoadResult = new Boolean(startResult); + sLibraryLoadResult = Boolean.valueOf(startResult); // Notify any oustanding callers to #startAsync(). notifyCallbacksAndClear(); |