diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-11-02 16:23:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-03 00:24:19 +0000 |
| commit | 02d6496adfb377afc0708e53cd0c8118c0591f99 (patch) | |
| tree | 4db6e095b22d8e08be682b1f392614f61220a25e /base | |
| parent | 3f68fa599eeafbd0282c99baadeaab3289388832 (diff) | |
| download | chromium_src-02d6496adfb377afc0708e53cd0c8118c0591f99.zip chromium_src-02d6496adfb377afc0708e53cd0c8118c0591f99.tar.gz chromium_src-02d6496adfb377afc0708e53cd0c8118c0591f99.tar.bz2 | |
Reland Reland Switch Chrome Android using v8 arch specific external data name
This patch also fix package_resource.py issue that asset's
renaming didn't trigger the packaging.
origin patch
https://codereview.chromium.org/1417753004/
Switch Chrome Android using v8 arch specific external data name
For 32-bit, natives_blob_32.bin and snapshot_blob_32.bin are used.
For 64-bit, natives_blob_64.bin and natives_blob_64.bin are used.
This patch also removed the existing v8 startup data in
destination directory by using copy_ex to remove directory
first.
BUG=540788,547235
TBR=jochen@chromium.org,dpranke@chromium.org,halliwell@chromium.org,jbudorick@chromium.org,mef@chromium.org,rmcilroy@chromium.org,dtrainor@chromium.org,cpu@chromium.org
Review URL: https://codereview.chromium.org/1422793004
Cr-Commit-Position: refs/heads/master@{#357480}
Diffstat (limited to 'base')
| -rw-r--r-- | base/android/java/src/org/chromium/base/ApkAssets.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/base/android/java/src/org/chromium/base/ApkAssets.java b/base/android/java/src/org/chromium/base/ApkAssets.java index a30054f..e00be99 100644 --- a/base/android/java/src/org/chromium/base/ApkAssets.java +++ b/base/android/java/src/org/chromium/base/ApkAssets.java @@ -33,19 +33,6 @@ public class ApkAssets { afd.getStartOffset(), afd.getLength() }; } catch (IOException e) { - // TODO(michaelbai): Remove dump assets once crbug.com/547235 fixed. - try { - String[] assets = context.getAssets().list(""); - StringBuffer sb = new StringBuffer("Dump assets(" + assets.length + "):\n"); - for (String asset : assets) { - sb.append(asset); - sb.append("\n"); - } - Log.e(LOGTAG, sb.toString()); - } catch (IOException ioe) { - Log.e(LOGTAG, "Error while list assets: " + ioe); - } - Log.e(LOGTAG, "Error while loading asset " + fileName + ": " + e); return new long[] {-1, -1, -1}; } finally { |