Title: [100428] trunk/Tools
- Revision
- 100428
- Author
- commit-qu...@webkit.org
- Date
- 2011-11-16 03:49:52 -0800 (Wed, 16 Nov 2011)
Log Message
[Chromium] Update the Android NDK version being pulled in by update-webkit-chromium
https://bugs.webkit.org/show_bug.cgi?id=72384
Update to Android NDK r7, which was released last Friday. This adds
support for RTTI and the -mimplicit-it gcc flag, which are required to
respectively build ICU and Skia.
Patch by Peter Beverloo <pe...@chromium.org> on 2011-11-16
Reviewed by Steve Block.
* Scripts/update-webkit-chromium:
* Scripts/webkitdirs.pm:
(buildChromiumMakefile):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100427 => 100428)
--- trunk/Tools/ChangeLog 2011-11-16 10:56:52 UTC (rev 100427)
+++ trunk/Tools/ChangeLog 2011-11-16 11:49:52 UTC (rev 100428)
@@ -1,3 +1,18 @@
+2011-11-16 Peter Beverloo <pe...@chromium.org>
+
+ [Chromium] Update the Android NDK version being pulled in by update-webkit-chromium
+ https://bugs.webkit.org/show_bug.cgi?id=72384
+
+ Update to Android NDK r7, which was released last Friday. This adds
+ support for RTTI and the -mimplicit-it gcc flag, which are required to
+ respectively build ICU and Skia.
+
+ Reviewed by Steve Block.
+
+ * Scripts/update-webkit-chromium:
+ * Scripts/webkitdirs.pm:
+ (buildChromiumMakefile):
+
2011-11-16 Simon Hausmann <simon.hausm...@nokia.com>
Unreviewed, rolling out r100266.
Modified: trunk/Tools/Scripts/update-webkit-chromium (100427 => 100428)
--- trunk/Tools/Scripts/update-webkit-chromium 2011-11-16 10:56:52 UTC (rev 100427)
+++ trunk/Tools/Scripts/update-webkit-chromium 2011-11-16 11:49:52 UTC (rev 100428)
@@ -61,20 +61,20 @@
# 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 "third_party/android-ndk-r6b") {
- print "Installing the Android NDK, version 6b...\n";
+ if (! -e "third_party/android-ndk-r7") {
+ print "Installing the Android NDK, version 7...\n";
if (! -e "third_party/") {
mkdir "third_party";
}
my $host_os = isLinux() ? "linux" : "darwin";
- my $result = system("curl", "-o", "third_party/android-ndk-r6b.tar.bz2", "http://dl.google.com/android/ndk/android-ndk-r6b-" . $host_os . "-x86.tar.bz2");
+ my $result = system("curl", "-o", "third_party/android-ndk-r7.tar.bz2", "http://dl.google.com/android/ndk/android-ndk-r7-" . $host_os . "-x86.tar.bz2");
die "Couldn't download the Android NDK." if $result;
- $result = system("tar", "jxC", "third_party", "-f", "third_party/android-ndk-r6b.tar.bz2");
+ $result = system("tar", "jxC", "third_party", "-f", "third_party/android-ndk-r7.tar.bz2");
die "Couldn't extract the Android NDK." if $result;
}
- $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/third_party/android-ndk-r6b";
+ $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/third_party/android-ndk-r7";
$ENV{WEBKIT_ANDROID_BUILD} = 1;
}
Modified: trunk/Tools/Scripts/webkitdirs.pm (100427 => 100428)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-11-16 10:56:52 UTC (rev 100427)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-11-16 11:49:52 UTC (rev 100428)
@@ -1898,7 +1898,7 @@
# will verify that the installed NDK is indeed available.
if (isChromiumAndroid()) {
$command .= "bash -c \"source " . sourceDir() . "/Source/WebKit/chromium/build/android/envsetup.sh && ";
- $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/third_party/android-ndk-r6b";
+ $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/third_party/android-ndk-r7";
$ENV{WEBKIT_ANDROID_BUILD} = 1;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
