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

Unified Diff: gyp_skia

Issue 1122593003: Support SKIA_OUT on Mac and ChromeOS (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 8 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
Index: gyp_skia
diff --git a/gyp_skia b/gyp_skia
index 5828780183ecacd09ee47d0481f6b2ce07e3a53e..e68ac16a9a2f76c520feb3baa4d49b0c64116e72 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -68,12 +68,6 @@ def get_output_dir():
if not output_dir:
return os.path.join(os.path.abspath(script_dir), 'out')
- if (sys.platform.startswith('darwin') and
- (not os.getenv(ENVVAR_GYP_GENERATORS) or
- 'xcode' in os.getenv(ENVVAR_GYP_GENERATORS))):
- print 'ERROR: variable SKIA_OUT is not valid on Mac (using xcodebuild)'
borenet 2015/05/04 13:46:27 This actually does work, probably due to our use o
djsollen 2015/05/04 14:03:44 Will this break the workflow of those who use xcod
- sys.exit(-1);
-
if os.path.isabs(output_dir):
return output_dir
else:
« no previous file with comments | « no previous file | platform_tools/chromeos/bin/chromeos_setup.sh » ('j') | platform_tools/chromeos/bin/chromeos_setup.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698