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

Unified Diff: build/SConscript.main

Issue 19041: Allow "hammer Hammer SHARED=1" to build cleanly. (Closed)
Patch Set: remove media Created 11 years, 11 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 | « no previous file | build/SConscript.v8 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
diff --git a/build/SConscript.main b/build/SConscript.main
index 44dcb208abaaef4a7c5d3caf58bba529229c2ab8..d6df2c382713a373bc8cf1cbf9ca9e27cf50bd07 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -540,6 +540,16 @@ if ARGUMENTS.get('SYMBOLS') == '1':
if ARGUMENTS.get('SHARED') == '1':
linux_env.Replace(COMPONENT_STATIC=False)
+ # The shared library build only works for test_shell and test_shell_tests,
+ # so filter out Chrome.
+ print "Filtering out chrome and media build targets in shared object build."
+ linux_env.FilterOut(
+ BUILD_SCONSCRIPTS = [
+ '$CHROME_DIR/chrome.scons',
+ '$MEDIA_DIR/media.scons',
+ ]
+ )
+
# Build with system-provided NSS and GTK.
if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']:
try:
« no previous file with comments | « no previous file | build/SConscript.v8 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698