Title: [111517] trunk
- Revision
- 111517
- Author
- [email protected]
- Date
- 2012-03-21 03:05:57 -0700 (Wed, 21 Mar 2012)
Log Message
[Chromium] Remove Android build-fix when the proper fix rolled into WebKit
https://bugs.webkit.org/show_bug.cgi?id=80861
Reviewed by Tony Chang.
Source/WebKit/chromium:
No longer set the CC.target environment variable as this is no longer
required for project file generation.
* gyp_webkit:
Tools:
Remove most Android-specific logic from webkitdirs.pm in favor of
handling this during project generation time.
* Scripts/webkitdirs.pm:
(buildChromiumMakefile):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (111516 => 111517)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-21 10:00:51 UTC (rev 111516)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-21 10:05:57 UTC (rev 111517)
@@ -1,5 +1,17 @@
2012-03-21 Peter Beverloo <[email protected]>
+ [Chromium] Remove Android build-fix when the proper fix rolled into WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=80861
+
+ Reviewed by Tony Chang.
+
+ No longer set the CC.target environment variable as this is no longer
+ required for project file generation.
+
+ * gyp_webkit:
+
+2012-03-21 Peter Beverloo <[email protected]>
+
Unreviewed. Rolled DEPS.
* DEPS:
Modified: trunk/Source/WebKit/chromium/gyp_webkit (111516 => 111517)
--- trunk/Source/WebKit/chromium/gyp_webkit 2012-03-21 10:00:51 UTC (rev 111516)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2012-03-21 10:05:57 UTC (rev 111517)
@@ -87,7 +87,6 @@
envsetup_location = os.path.join(chrome_src, 'build', 'android', 'envsetup.sh')
exit(subprocess.call(['bash', '-c', 'source %s && python gyp_webkit --no-envsetup-recursion %s' % (envsetup_location, ' '.join(args))]))
else:
- os.environ['CC.target'] = os.environ['CROSS_CC']
args.remove('--no-envsetup-recursion')
# Add includes.
Modified: trunk/Tools/ChangeLog (111516 => 111517)
--- trunk/Tools/ChangeLog 2012-03-21 10:00:51 UTC (rev 111516)
+++ trunk/Tools/ChangeLog 2012-03-21 10:05:57 UTC (rev 111517)
@@ -1,3 +1,16 @@
+2012-03-21 Peter Beverloo <[email protected]>
+
+ [Chromium] Remove Android build-fix when the proper fix rolled into WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=80861
+
+ Reviewed by Tony Chang.
+
+ Remove most Android-specific logic from webkitdirs.pm in favor of
+ handling this during project generation time.
+
+ * Scripts/webkitdirs.pm:
+ (buildChromiumMakefile):
+
2012-03-21 Carlos Garcia Campos <[email protected]>
[GTK] Allow running _javascript_ from location bar in MiniBrowser
Modified: trunk/Tools/Scripts/webkitdirs.pm (111516 => 111517)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-03-21 10:00:51 UTC (rev 111516)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-21 10:05:57 UTC (rev 111517)
@@ -2303,27 +2303,8 @@
$makeArgs = $1 if /^--makeargs=(.*)/i;
}
$makeArgs = "-j$numCpus" if not $makeArgs;
- my $command = "";
+ my $command .= "make -fMakefile.chromium $makeArgs BUILDTYPE=$config $target";
- # Building the WebKit Chromium port for Android requires us to cross-
- # compile, which will be set up by Chromium's envsetup.sh. The script itself
- # 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/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";
- $command .= "\"" if isChromiumAndroid();
-
print "$command\n";
return system $command;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
