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

Unified Diff: build/SConscript.main

Issue 42650: Update Linux gyp build to import and propagate external environment... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 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
Download patch
« no previous file with comments | « DEPS ('k') | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
===================================================================
--- build/SConscript.main (revision 12565)
+++ build/SConscript.main (working copy)
@@ -86,6 +86,7 @@
all_system_libs = [],
CHROME_SRC_DIR = '$MAIN_DIR/..',
+ SRC_DIR = '$MAIN_DIR/..',
DESTINATION_ROOT = '$MAIN_DIR/$BUILD_TARGET_DIR',
# Where ComponentTestProgram() will build test executables.
@@ -775,6 +776,7 @@
# resolving these over and over again.
env.Replace(
CHROME_SRC_DIR = str(env.Dir('$CHROME_SRC_DIR')),
+ SRC_DIR = str(env.Dir('$SRC_DIR')),
DESTINATION_ROOT = str(env.Dir('$DESTINATION_ROOT')),
TARGET_ROOT = str(env.Dir('$TARGET_ROOT')),
OBJ_ROOT = str(env.Dir('$OBJ_ROOT')),
« no previous file with comments | « DEPS ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698