From 50b7313afada331600ae0a8c355888a974cc2719 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Wed, 9 Jul 2014 22:50:06 +0000 Subject: [PATCH] Add target_arch config variable to .isolate files. Deduplicate chrome.isolate items found in angle.isolate. Move comment about D3DCompiler_43.dll to 32bits build. If it is going to be mapped, it is only for 32 bits builds and not 64 bits builds since this DLL doesn't seem to exist in 64 bits. R=scheib@chromium.org,kbr@chromium.org BUG= Review URL: https://codereview.chromium.org/379843004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282155 0039d316-1c4b-4281-b951-d872f2087c98 --- build/android/pylib/gtest/setup.py | 2 ++ build/isolate.gypi | 1 + chrome/angle.isolate | 9 ++++++++- chrome/chrome.isolate | 5 +---- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index f29ee7e0ee771f..e343aa4ce418c8 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -138,6 +138,8 @@ def _GenerateDepsDirUsingIsolate(suite_name, isolate_file_path=None): '--config-variable', 'chromeos', '0', '--config-variable', 'component', 'static_library', '--config-variable', 'icu_use_data_file_flag', '1', + # TODO(maruel): This may not be always true. + '--config-variable', 'target_arch', 'arm', '--config-variable', 'use_openssl', '0', ] assert not cmd_helper.RunCmd(isolate_cmd) diff --git a/build/isolate.gypi b/build/isolate.gypi index c291916e2b7cb5..38d7aeea43d095 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -100,6 +100,7 @@ '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', '--config-variable', 'use_openssl=<(use_openssl)', + '--config-variable', 'target_arch=<(target_arch)', ], 'conditions': [ # Note: When gyp merges lists, it appends them to the old value. diff --git a/chrome/angle.isolate b/chrome/angle.isolate index 13b1a1519ade8c..bf4a49f5a8bb63 100644 --- a/chrome/angle.isolate +++ b/chrome/angle.isolate @@ -9,11 +9,18 @@ ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', - '<(PRODUCT_DIR)/d3dcompiler_46.dll', + ], + }, + }], + ['OS=="win" and target_arch=="ia32"', { + 'variables': { + 'isolate_dependency_tracked': [ # TODO(kbr): really need D3DCompiler_43.dll as well for XP, # but ANGLE doesn't contain the rule which extracts this. + #'<(PRODUCT_DIR)/D3DCompiler_43.dll', ], }, }], diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 37c934750c3f80..f03f3e31a9e0ab 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -60,11 +60,8 @@ '<(PRODUCT_DIR)/<(version_full).manifest', '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/chrome_elf.dll', - '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', - '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libexif.dll', - '<(PRODUCT_DIR)/libGLESv2.dll', '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/osmesa.dll', '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', @@ -80,6 +77,6 @@ }], ], 'includes': [ - '../base/base.isolate', + 'angle.isolate', ], }