diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:05:30 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:05:30 +0000 |
| commit | 84c63880bf6afc3bc9c6075c807e2206db9ed59b (patch) | |
| tree | 8f931ad2d4c62b420fb0f2b40723e860473dbd4a /o3d/svn_paths.scons | |
| parent | 0df95fd432f9023ce03548c2aba8ca4d774910f7 (diff) | |
| download | chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.zip chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.tar.gz chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.tar.bz2 | |
This adds a DEPS file for o3d that maps in all of its dependencies,
and updates the build files so that it will build.
Review URL: http://codereview.chromium.org/115847
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/svn_paths.scons')
| -rw-r--r-- | o3d/svn_paths.scons | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons index 6e7f96e..a9e0f48 100644 --- a/o3d/svn_paths.scons +++ b/o3d/svn_paths.scons @@ -33,7 +33,7 @@ import sys Import('env') env.Replace( - GOOGLECLIENT = '$SCONSTRUCT_DIR/..', + GOOGLECLIENT = '$SCONSTRUCT_DIR', THIRD_PARTY = '$GOOGLECLIENT/third_party', # A whole bunch of third-party and internal dependencies @@ -56,7 +56,9 @@ env.Replace( # Set this to run an hermetic version of Firefox with Selenium on the Mac. # See tests/build.scons MAC_HERMETIC_FIREFOX_DIR = None, - NACL_DIR = '$GOOGLECLIENT/native_client', + # NACL has to be in this weird directory because it looks for + # googleclient two levels above it. + NACL_DIR = '$THIRD_PARTY/native_client/googleclient/native_client', NIXYSA_DIR = '$THIRD_PARTY/nixysa/files', NPAPI_DIR = '$THIRD_PARTY/npapi/files', PDIFF_DIR = '$THIRD_PARTY/pdiff/files', |