From 837c88b9a8072ca14f9a32b4ed369e499d64eac4 Mon Sep 17 00:00:00 2001 From: "mseaborn@chromium.org" Date: Wed, 11 May 2011 09:32:29 +0000 Subject: NaCl: Add the integrated runtime (IRT) library to Mac install images We add a copy step to 'chrome_dll'. Previously nacl_irt_* was copied into <(PRODUCT_DIR) by 'chrome_exe', which depends on 'chrome_dll'. Since we don't want an undeclared circular dependency of 'chrome_dll' on 'chrome_exe', we move the earlier copy step into the 'nacl' target, which 'chrome_dll' already depends on. This means that the check for 'disable_nacl' is no longer necessary, since the 'nacl' target is conditionally depended on. BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595 TEST=do a clean build on Mac, at least with xcodebuild/Debug/nacl_irt_* not present to start with Review URL: http://codereview.chromium.org/6997013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84961 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/nacl.gypi | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'chrome/nacl.gypi') diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 1d9ab38..84da264 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -81,6 +81,15 @@ '<@(nacl_defines)', ], }, + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '../native_client/irt_binaries/nacl_irt_x86_32.nexe', + '../native_client/irt_binaries/nacl_irt_x86_64.nexe', + ], + }, + ], }, ], 'conditions': [ -- cgit v1.1