Title: [111382] trunk/Tools
- Revision
- 111382
- Author
- [email protected]
- Date
- 2012-03-20 04:57:34 -0700 (Tue, 20 Mar 2012)
Log Message
[Chromium] Update to Android NDK r7b
https://bugs.webkit.org/show_bug.cgi?id=81005
Reviewed by Adam Barth.
Update to version r7b of the Android NDK, release notes of which are
available on the following page:
http://developer.android.com/sdk/ndk/index.html
* Scripts/update-webkit-chromium:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111381 => 111382)
--- trunk/Tools/ChangeLog 2012-03-20 11:52:54 UTC (rev 111381)
+++ trunk/Tools/ChangeLog 2012-03-20 11:57:34 UTC (rev 111382)
@@ -1,3 +1,16 @@
+2012-03-20 Peter Beverloo <[email protected]>
+
+ [Chromium] Update to Android NDK r7b
+ https://bugs.webkit.org/show_bug.cgi?id=81005
+
+ Reviewed by Adam Barth.
+
+ Update to version r7b of the Android NDK, release notes of which are
+ available on the following page:
+ http://developer.android.com/sdk/ndk/index.html
+
+ * Scripts/update-webkit-chromium:
+
2012-03-20 Csaba Osztrogonác <[email protected]>
x86 GCC bug triggers a compilation error in generated copy constructor of CollapsedBorderValue
Modified: trunk/Tools/Scripts/update-webkit-chromium (111381 => 111382)
--- trunk/Tools/Scripts/update-webkit-chromium 2012-03-20 11:52:54 UTC (rev 111381)
+++ trunk/Tools/Scripts/update-webkit-chromium 2012-03-20 11:57:34 UTC (rev 111382)
@@ -62,17 +62,17 @@
# When building WebKit's Chromium port for Android, we need the Android NDK as
# it will allow us to cross-compile all sources to the target architecture.
if (isChromiumAndroid()) {
- if (! -e "android-ndk-r7") {
- print "Installing the Android NDK, version 7...\n";
+ if (! -e "android-ndk-r7b") {
+ print "Installing the Android NDK, version 7b...\n";
my $host_os = isLinux() ? "linux" : "darwin";
- my $result = system("curl", "-o", "android-ndk-r7.tar.bz2", "http://dl.google.com/android/ndk/android-ndk-r7-" . $host_os . "-x86.tar.bz2");
+ my $result = system("curl", "-o", "android-ndk-r7b.tar.bz2", "http://dl.google.com/android/ndk/android-ndk-r7b-" . $host_os . "-x86.tar.bz2");
die "Couldn't download the Android NDK." if $result;
- $result = system("tar", "jx", "-f", "android-ndk-r7.tar.bz2");
+ $result = system("tar", "jx", "-f", "android-ndk-r7b.tar.bz2");
die "Couldn't extract the Android NDK." if $result;
}
- $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/android-ndk-r7";
+ $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/android-ndk-r7b";
$ENV{WEBKIT_ANDROID_BUILD} = 1;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
