Changeset 102700 in webkit


Ignore:
Timestamp:
Dec 13, 2011 1:23:02 PM (12 years ago)
Author:
peter@chromium.org
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):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r102698 r102700  
     12011-12-13  Peter Beverloo  <peter@chromium.org>
     2
     3        [Chromium] Pull in FreeType and decrease check-out complexity for Android
     4        https://bugs.webkit.org/show_bug.cgi?id=74401
     5
     6        Pull in FreeType in the third_party/ directory from a separate git
     7        repository at Chromium. This introduces a new prerequisite for checking
     8        out the Chromium WebKit port for Android, namely that git needs to be
     9        available on the system. gclient can handle this just fine.
     10
     11        Reviewed by Adam Barth.
     12
     13        * DEPS:
     14
    1152011-12-13  Alok Priyadarshi  <alokp@chromium.org>
    216
  • trunk/Source/WebKit/chromium/DEPS

    r102454 r102700  
    177177      From('chromium_deps', 'src/third_party/openssl'),
    178178  },
     179  'android': {
     180    'third_party/freetype':
     181      'https://git.chromium.org/chromium/src/third_party/freetype.git',
     182  },
    179183}
    180184
  • trunk/Tools/ChangeLog

    r102686 r102700  
     12011-12-13  Peter Beverloo  <peter@chromium.org>
     2
     3        [Chromium] Pull in FreeType and decrease check-out complexity for Android
     4        https://bugs.webkit.org/show_bug.cgi?id=74401
     5
     6        Decrease the check-out complexity by removing the need to first run
     7        "update-webkit-chromium --chromium" prior to running it with
     8        "--chromium-android", which was caused by an unversioned third_party/
     9        directory being created. This moves the Android NDK to Source/WebKit/
     10        chromium/, coming from third_party/ in that directory.
     11
     12        Reviewed by Adam Barth.
     13
     14        * Scripts/update-webkit-chromium:
     15        * Scripts/webkitdirs.pm:
     16        (buildChromiumMakefile):
     17
    1182011-12-13  Andy Wingo  <wingo@igalia.com> and Martin Robinson <mrobinson@igalia.com>
    219
  • trunk/Tools/Scripts/update-webkit-chromium

    r100428 r102700  
    6262# it will allow us to cross-compile all sources to the target architecture.
    6363if (isChromiumAndroid()) {
    64     if (! -e "third_party/android-ndk-r7") {
     64    if (! -e "android-ndk-r7") {
    6565        print "Installing the Android NDK, version 7...\n";
    66         if (! -e "third_party/") {
    67             mkdir "third_party";
    68         }
    6966        my $host_os = isLinux() ? "linux" : "darwin";
    70         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");
     67        my $result = system("curl", "-o", "android-ndk-r7.tar.bz2", "http://dl.google.com/android/ndk/android-ndk-r7-" . $host_os . "-x86.tar.bz2");
    7168        die "Couldn't download the Android NDK." if $result;
    7269
    73         $result = system("tar", "jxC", "third_party", "-f", "third_party/android-ndk-r7.tar.bz2");
     70        $result = system("tar", "jx", "-f", "android-ndk-r7.tar.bz2");
    7471        die "Couldn't extract the Android NDK." if $result;
    7572    }
    7673
    77     $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/third_party/android-ndk-r7";
     74    $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/android-ndk-r7";
    7875    $ENV{WEBKIT_ANDROID_BUILD} = 1;
    7976}
  • trunk/Tools/Scripts/webkitdirs.pm

    r102685 r102700  
    20232023    if (isChromiumAndroid()) {
    20242024        $command .= "bash -c \"source " . sourceDir() . "/Source/WebKit/chromium/build/android/envsetup.sh && ";
    2025         $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/third_party/android-ndk-r7";
     2025        $ENV{ANDROID_NDK_ROOT} = sourceDir() . "/Source/WebKit/chromium/android-ndk-r7";
    20262026        $ENV{WEBKIT_ANDROID_BUILD} = 1;
    20272027    }
Note: See TracChangeset for help on using the changeset viewer.