Title: [131394] trunk/Source/WebKit/chromium
- Revision
- 131394
- Author
- [email protected]
- Date
- 2012-10-15 18:20:18 -0700 (Mon, 15 Oct 2012)
Log Message
[Chromium] The default target for Android builds should be "all" instead of "All"
https://bugs.webkit.org/show_bug.cgi?id=98879
Reviewed by Adam Barth.
The default gyp target for Android builds is being overridden in Chromium's
envsetup_functions.sh to "All" (whereas the rest of Chromium and WebKit use "all"),
because Android wants to use a different list of main targets. There is
no need to do this for the WebKit project, and it's breaking ninja.
* gyp_webkit:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (131393 => 131394)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-10-16 01:17:47 UTC (rev 131393)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-10-16 01:20:18 UTC (rev 131394)
@@ -1,3 +1,17 @@
+2012-10-15 Peter Beverloo <[email protected]>
+
+ [Chromium] The default target for Android builds should be "all" instead of "All"
+ https://bugs.webkit.org/show_bug.cgi?id=98879
+
+ Reviewed by Adam Barth.
+
+ The default gyp target for Android builds is being overridden in Chromium's
+ envsetup_functions.sh to "All" (whereas the rest of Chromium and WebKit use "all"),
+ because Android wants to use a different list of main targets. There is
+ no need to do this for the WebKit project, and it's breaking ninja.
+
+ * gyp_webkit:
+
2012-10-15 Kent Tamura <[email protected]>
LocaleMacTest.formatDate is failing on Mac 10.8
Modified: trunk/Source/WebKit/chromium/gyp_webkit (131393 => 131394)
--- trunk/Source/WebKit/chromium/gyp_webkit 2012-10-16 01:17:47 UTC (rev 131393)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2012-10-16 01:20:18 UTC (rev 131394)
@@ -89,6 +89,11 @@
else:
args.remove('--no-envsetup-recursion')
+ # Chromium's Android configuration uses the "All" target instead of "all", as it
+ # uses a different list of dependencies. WebKit needs to use "all" for Ninja to work.
+ if 'default_target=All' in os.environ.get('GYP_GENERATOR_FLAGS', ''):
+ args.append('-Gdefault_target=all')
+
# Add includes.
args.extend(['-I' + i for i in additional_include_files(args)])
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
