diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-10-23 13:54:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 20:56:19 +0000 |
| commit | 77a03f6624a369d01b565b46e3584d25ae41fb0b (patch) | |
| tree | dca800e84224c1a04139811a798c4c7dee777fc3 /content/content_shell.gypi | |
| parent | efac61aadc057f6e98ba628e68e5ad1d5c76053e (diff) | |
| download | chromium_src-77a03f6624a369d01b565b46e3584d25ae41fb0b.zip chromium_src-77a03f6624a369d01b565b46e3584d25ae41fb0b.tar.gz chromium_src-77a03f6624a369d01b565b46e3584d25ae41fb0b.tar.bz2 | |
Revert of Reland Switch Chrome Android using v8 arch specific external data name (patchset #3 id:40001 of https://codereview.chromium.org/1417753004/ )
Reason for revert:
broke gpu bots: https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/3712
Original issue's description:
> Orignal patch
> https://codereview.chromium.org/1400953002/
>
> 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
> 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
>
> Committed: https://crrev.com/ed31140dee44c06e6398e92e1afb9c047c9137e6
> Cr-Commit-Position: refs/heads/master@{#355843}
TBR=michaelbai@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=540788
Review URL: https://codereview.chromium.org/1421893002
Cr-Commit-Position: refs/heads/master@{#355877}
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index a514707..e170e34 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -403,6 +403,16 @@ 'browser/devtools/devtools_resources.gyp:devtools_resources', ], }], + ['OS=="android"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak' + ], + }, + ], + }], ['toolkit_views==1', { 'dependencies': [ '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources' @@ -427,7 +437,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', ], - 'pak_output': '<(PRODUCT_DIR)/content_shell.pak', 'conditions': [ ['toolkit_views==1', { 'pak_inputs': [ @@ -436,6 +445,9 @@ }], ['OS!="android"', { 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',], + 'pak_output': '<(PRODUCT_DIR)/content_shell.pak', + }, { + 'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', }], ], }, @@ -908,8 +920,9 @@ 'target_name': 'content_shell_apk', 'type': 'none', 'dependencies': [ - 'content.gyp:content_shell_assets_copy', + 'content.gyp:content_icudata', 'content.gyp:content_java', + 'content.gyp:content_v8_external_data', 'content_java_test_support', 'content_shell_java', 'libcontent_shell_content_view', |