summaryrefslogtreecommitdiffstats
path: root/o3d/tests
diff options
context:
space:
mode:
authorgspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-20 20:32:17 +0000
committergspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-20 20:32:17 +0000
commit569820dba13c87bd7da7789a31d830034e9b7b4e (patch)
tree52565b0f74de528e258b931b5023dadc01c6a920 /o3d/tests
parent73fa6399bd9198863d7d9e01db6fcc8cdfcc8837 (diff)
downloadchromium_src-569820dba13c87bd7da7789a31d830034e9b7b4e.zip
chromium_src-569820dba13c87bd7da7789a31d830034e9b7b4e.tar.gz
chromium_src-569820dba13c87bd7da7789a31d830034e9b7b4e.tar.bz2
Update the nacl part of the gyp build so it works correctly for tests,
and so it doesn't have a hard-coded path to python... Review URL: http://codereview.chromium.org/159093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
-rw-r--r--o3d/tests/tests.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index 895f2e5..c55befe 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -28,10 +28,11 @@
'../../base/base.gyp:base',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
+ '../build/nacl.gyp:build_nacl',
'../compiler/technique/technique.gyp:technique',
'../core/core.gyp:o3dCoreTest',
- '../import/import.gyp:o3dImportTest',
'../import/archive.gyp:o3dArchiveTest',
+ '../import/import.gyp:o3dImportTest',
'../serializer/serializer.gyp:o3dSerializerTest',
'../statsreport/statsreport.gyp:o3dStatsReportTest',
'../utils/utils.gyp:o3dUtils',