Reland Reland Reland Switch Chrome Android using v8 arch specific external data name
This patch changed all android GN target which use v8 snapshot files as of it being prepared. origin patch https://codereview.chromium.org/1422793004/ 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/1411283009 Cr-Original-Commit-Position: refs/heads/master@{#357577} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 01630673ae102e70913ac6832fa994c50a1514b5
This commit is contained in:
Родитель
341192c1eb
Коммит
5c5780b9d9
|
@ -296,15 +296,26 @@ def main(args):
|
|||
options.language_splits))
|
||||
|
||||
input_paths = [ options.android_manifest ] + options.resource_zips
|
||||
|
||||
input_strings = []
|
||||
input_strings.extend(package_command)
|
||||
|
||||
# The md5_check.py doesn't count file path in md5 intentionally,
|
||||
# in order to repackage resources when assets' name changed, we need
|
||||
# to put assets into input_strings, as we know the assets path isn't
|
||||
# changed among each build if there is no asset change.
|
||||
if options.asset_dir and os.path.exists(options.asset_dir):
|
||||
asset_paths = []
|
||||
for root, _, filenames in os.walk(options.asset_dir):
|
||||
input_paths.extend(os.path.join(root, f) for f in filenames)
|
||||
asset_paths.extend(os.path.join(root, f) for f in filenames)
|
||||
input_paths.extend(asset_paths)
|
||||
input_strings.extend(sorted(asset_paths))
|
||||
|
||||
build_utils.CallAndWriteDepfileIfStale(
|
||||
lambda: _OnStaleMd5(package_command, options),
|
||||
options,
|
||||
input_paths=input_paths,
|
||||
input_strings=package_command,
|
||||
input_strings=input_strings,
|
||||
output_paths=output_paths)
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
# Copyright (c) 2015 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
{
|
||||
'variables': {
|
||||
'arch_suffix': '<(arch_suffix)',
|
||||
'variables': {
|
||||
# This help to find out if target_arch is set to something else.
|
||||
'arch_suffix': '<(target_arch)',
|
||||
'conditions': [
|
||||
['target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel"', {
|
||||
'arch_suffix': '32',
|
||||
}],
|
||||
['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', {
|
||||
'arch_suffix':'64'
|
||||
}],
|
||||
],
|
||||
}
|
||||
}
|
||||
}
|
Загрузка…
Ссылка в новой задаче