Title: [125542] trunk/Source/WebKit/chromium
- Revision
- 125542
- Author
- [email protected]
- Date
- 2012-08-14 04:32:46 -0700 (Tue, 14 Aug 2012)
Log Message
[Chromium] Fix apk generation for the Android platform
https://bugs.webkit.org/show_bug.cgi?id=93841
Unreviewed build fix (step 2).
The path from webkit_unit_tests isn't robust enough. Use the same
convention as the Chromium side, i.e. walk up from the ant_build_out path.
One-line Android-only gyp change.
* WebKitUnitTests.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (125541 => 125542)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-14 11:28:25 UTC (rev 125541)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-14 11:32:46 UTC (rev 125542)
@@ -3,6 +3,19 @@
[Chromium] Fix apk generation for the Android platform
https://bugs.webkit.org/show_bug.cgi?id=93841
+ Unreviewed build fix (step 2).
+
+ The path from webkit_unit_tests isn't robust enough. Use the same
+ convention as the Chromium side, i.e. walk up from the ant_build_out path.
+ One-line Android-only gyp change.
+
+ * WebKitUnitTests.gyp:
+
+2012-08-14 Peter Beverloo <[email protected]>
+
+ [Chromium] Fix apk generation for the Android platform
+ https://bugs.webkit.org/show_bug.cgi?id=93841
+
Unreviewed build fix.
APK generation was broken as the configuration file assumed compilation
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (125541 => 125542)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-14 11:28:25 UTC (rev 125541)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-14 11:32:46 UTC (rev 125542)
@@ -151,7 +151,7 @@
['inside_chromium_build==1', {
'ant_build_to_chromium_src': '<(ant_build_out)/../../',
}, {
- 'ant_build_to_chromium_src': '<(chromium_src_dir)',
+ 'ant_build_to_chromium_src': '<(ant_build_out)/../../Source/WebKit/chromium',
}],
],
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
