Title: [110460] trunk/Tools
- Revision
- 110460
- Author
- [email protected]
- Date
- 2012-03-12 12:50:34 -0700 (Mon, 12 Mar 2012)
Log Message
[Chromium] Temporary build-fix for the Android bot
https://bugs.webkit.org/show_bug.cgi?id=80862
Reviewed by Adam Barth.
Manually set the environmental variables required to compile source
files through the Android NDK instead of relying on the envsetup.sh
script. A proper fix will be landed to Chromium ASAP, and following
a Chromium roll into WebKit this code will be removed.
* Scripts/webkitdirs.pm:
(buildChromiumMakefile):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (110459 => 110460)
--- trunk/Tools/ChangeLog 2012-03-12 19:47:16 UTC (rev 110459)
+++ trunk/Tools/ChangeLog 2012-03-12 19:50:34 UTC (rev 110460)
@@ -1,3 +1,18 @@
+2012-03-12 Peter Beverloo <[email protected]>
+
+ [Chromium] Temporary build-fix for the Android bot
+ https://bugs.webkit.org/show_bug.cgi?id=80862
+
+ Reviewed by Adam Barth.
+
+ Manually set the environmental variables required to compile source
+ files through the Android NDK instead of relying on the envsetup.sh
+ script. A proper fix will be landed to Chromium ASAP, and following
+ a Chromium roll into WebKit this code will be removed.
+
+ * Scripts/webkitdirs.pm:
+ (buildChromiumMakefile):
+
2012-03-12 Tor Arne Vestbø <[email protected]>
[Qt] Use right construct to detect config_test_gccdepends
Modified: trunk/Tools/Scripts/webkitdirs.pm (110459 => 110460)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-03-12 19:47:16 UTC (rev 110459)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-12 19:50:34 UTC (rev 110460)
@@ -2302,6 +2302,13 @@
$command .= "bash -c \"source " . sourceDir() . "/Source/WebKit/chromium/build/android/envsetup.sh && ";
$ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/android-ndk-r7";
$ENV{WEBKIT_ANDROID_BUILD} = 1;
+
+ # FIXME: Remove the build-fix once the Chromium-side fix rolled in.
+ # https://bugs.webkit.org/show_bug.cgi?id=80861
+ my $binaryPrefix = $ENV{ANDROID_NDK_ROOT} . "/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi";
+ $command .= qq(CC="$binaryPrefix-gcc" CXX="$binaryPrefix-g++" );
+ $command .= qq(LINK="$binaryPrefix-gcc" AR="$binaryPrefix-ar" );
+ $command .= qq(RANLIB="$binaryPrefix-ranlib" );
}
$command .= "make -fMakefile.chromium $makeArgs BUILDTYPE=$config $target";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
