diff options
Diffstat (limited to 'o3d/build/common.gypi')
| -rw-r--r-- | o3d/build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 9f058c4..ca2b697 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -21,12 +21,12 @@ 'skiadir': 'third_party/skia/include', 'zlibdir': 'third_party/zlib', # If the DEPS file exists two levels up, then we're in a Chrome tree. - 'o3d_in_chrome%': '<!(python <(DEPTH)/o3d/build/file_exists.py ../../DEPS)', + 'o3d_in_chrome%': '<!(python <(DEPTH)/o3d/build/file_exists.py <(DEPTH)/DEPS)', # We default to building everything only if the assets exist. # (and the teapot is the least likely asset to change). # This is so that chrome developers get a much reduced dependency set. 'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py ' - '../o3d_assets/samples/convert_assets/teapot.zip)', + '<(DEPTH)/o3d/o3d_assets/samples/convert_assets/teapot.zip)', 'selenium_screenshots%': 0, 'conditions' : [ # These have to come first because GYP doesn't like it when @@ -72,7 +72,7 @@ }], ], 'conditions': [ - ['o3d_in_chrome != 0', + ['o3d_in_chrome == "True"', { 'defines': [ 'O3D_IN_CHROME', |