svn_paths.scons - Issue 115847: This adds a DEPS file for o3d that maps in all of its dependencies,... - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(1357)

My Issues | Starred Open | Closed | All

Unified Diff: svn_paths.scons

Issue 115847: This adds a DEPS file for o3d that maps in all of its dependencies,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/

Patch Set: '' Created 11 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « scons.bat ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: svn_paths.scons

===================================================================

--- svn_paths.scons (revision 17117)

+++ svn_paths.scons (working copy)

@@ -33,7 +33,7 @@

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 @@

# 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',

« no previous file with comments | « scons.bat ('k') | no next file » | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698