Title: [102700] trunk
- Revision
- 102700
- Author
- [email protected]
- Date
- 2011-12-13 13:23:02 -0800 (Tue, 13 Dec 2011)
Log Message
[Chromium] Pull in FreeType and decrease check-out complexity for Android
https://bugs.webkit.org/show_bug.cgi?id=74401
Source/WebKit/chromium:
Pull in FreeType in the third_party/ directory from a separate git
repository at Chromium. This introduces a new prerequisite for checking
out the Chromium WebKit port for Android, namely that git needs to be
available on the system. gclient can handle this just fine.
Reviewed by Adam Barth.
* DEPS:
Tools:
Decrease the check-out complexity by removing the need to first run
"update-webkit-chromium --chromium" prior to running it with
"--chromium-android", which was caused by an unversioned third_party/
directory being created. This moves the Android NDK to Source/WebKit/
chromium/, coming from third_party/ in that directory.
Reviewed by Adam Barth.
* Scripts/update-webkit-chromium:
* Scripts/webkitdirs.pm:
(buildChromiumMakefile):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102699 => 102700)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-13 21:19:52 UTC (rev 102699)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-13 21:23:02 UTC (rev 102700)
@@ -1,3 +1,17 @@
+2011-12-13 Peter Beverloo <[email protected]>
+
+ [Chromium] Pull in FreeType and decrease check-out complexity for Android
+ https://bugs.webkit.org/show_bug.cgi?id=74401
+
+ Pull in FreeType in the third_party/ directory from a separate git
+ repository at Chromium. This introduces a new prerequisite for checking
+ out the Chromium WebKit port for Android, namely that git needs to be
+ available on the system. gclient can handle this just fine.
+
+ Reviewed by Adam Barth.
+
+ * DEPS:
+
2011-12-13 Alok Priyadarshi <[email protected]>
[chromium] compositing/masks layout tests fail with accelerated drawing
Modified: trunk/Source/WebKit/chromium/DEPS (102699 => 102700)
--- trunk/Source/WebKit/chromium/DEPS 2011-12-13 21:19:52 UTC (rev 102699)
+++ trunk/Source/WebKit/chromium/DEPS 2011-12-13 21:23:02 UTC (rev 102700)
@@ -176,6 +176,10 @@
'third_party/openssl':
From('chromium_deps', 'src/third_party/openssl'),
},
+ 'android': {
+ 'third_party/freetype':
+ 'https://git.chromium.org/chromium/src/third_party/freetype.git',
+ },
}
skip_child_includes = [
Modified: trunk/Tools/ChangeLog (102699 => 102700)
--- trunk/Tools/ChangeLog 2011-12-13 21:19:52 UTC (rev 102699)
+++ trunk/Tools/ChangeLog 2011-12-13 21:23:02 UTC (rev 102700)
@@ -1,3 +1,20 @@
+2011-12-13 Peter Beverloo <[email protected]>
+
+ [Chromium] Pull in FreeType and decrease check-out complexity for Android
+ https://bugs.webkit.org/show_bug.cgi?id=74401
+
+ Decrease the check-out complexity by removing the need to first run
+ "update-webkit-chromium --chromium" prior to running it with
+ "--chromium-android", which was caused by an unversioned third_party/
+ directory being created. This moves the Android NDK to Source/WebKit/
+ chromium/, coming from third_party/ in that directory.
+
+ Reviewed by Adam Barth.
+
+ * Scripts/update-webkit-chromium:
+ * Scripts/webkitdirs.pm:
+ (buildChromiumMakefile):
+
2011-12-13 Andy Wingo <[email protected]> and Martin Robinson <[email protected]>
build-jsc passing incorrect args to buildGtkProject
Modified: trunk/Tools/Scripts/update-webkit-chromium (102699 => 102700)
--- trunk/Tools/Scripts/update-webkit-chromium 2011-12-13 21:19:52 UTC (rev 102699)
+++ trunk/Tools/Scripts/update-webkit-chromium 2011-12-13 21:23:02 UTC (rev 102700)
@@ -61,20 +61,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 "third_party/android-ndk-r7") {
+ if (! -e "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-r7.tar.bz2", "http://dl.google.com/android/ndk/android-ndk-r7-" . $host_os . "-x86.tar.bz2");
+ my $result = system("curl", "-o", "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-r7.tar.bz2");
+ $result = system("tar", "jx", "-f", "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-r7";
+ $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/android-ndk-r7";
$ENV{WEBKIT_ANDROID_BUILD} = 1;
}
Modified: trunk/Tools/Scripts/webkitdirs.pm (102699 => 102700)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-12-13 21:19:52 UTC (rev 102699)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-12-13 21:23:02 UTC (rev 102700)
@@ -2022,7 +2022,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-r7";
+ $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/android-ndk-r7";
$ENV{WEBKIT_ANDROID_BUILD} = 1;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
