Title: [213123] trunk
Revision
213123
Author
[email protected]
Date
2017-02-27 23:11:13 -0800 (Mon, 27 Feb 2017)

Log Message

Begin enabling WebRTC on 64-bit
https://bugs.webkit.org/show_bug.cgi?id=168915

Reviewed by Eric Carlson.

Source/_javascript_Core:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Tools:

* Scripts/build-webkit:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (213122 => 213123)


--- trunk/Source/_javascript_Core/ChangeLog	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-02-28 07:11:13 UTC (rev 213123)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <[email protected]>
+
+        Begin enabling WebRTC on 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=168915
+
+        Reviewed by Eric Carlson.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-02-27  Mark Lam  <[email protected]>
 
         Introduce a VM Traps mechanism and refactor Watchdog to use it.

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (213122 => 213123)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-02-28 07:11:13 UTC (rev 213123)
@@ -164,6 +164,12 @@
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 
+ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
+ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios_11_Debug = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Release = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Production = ;
 ENABLE_WEB_RTC[sdk=macosx*] = $(ENABLE_WEB_RTC_macosx);
 ENABLE_WEB_RTC_macosx[arch=x86_64] = $(ENABLE_WEB_RTC_macosx_$(CONFIGURATION));
 ENABLE_WEB_RTC_macosx_Debug = ENABLE_WEB_RTC;

Modified: trunk/Source/WebCore/ChangeLog (213122 => 213123)


--- trunk/Source/WebCore/ChangeLog	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebCore/ChangeLog	2017-02-28 07:11:13 UTC (rev 213123)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <[email protected]>
+
+        Begin enabling WebRTC on 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=168915
+
+        Reviewed by Eric Carlson.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-02-27  Antoine Quint  <[email protected]>
 
         [Modern Media Controls] Use compact mode by default on macOS

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (213122 => 213123)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2017-02-28 07:11:13 UTC (rev 213123)
@@ -164,6 +164,12 @@
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 
+ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
+ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios_11_Debug = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Release = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Production = ;
 ENABLE_WEB_RTC[sdk=macosx*] = $(ENABLE_WEB_RTC_macosx);
 ENABLE_WEB_RTC_macosx[arch=x86_64] = $(ENABLE_WEB_RTC_macosx_$(CONFIGURATION));
 ENABLE_WEB_RTC_macosx_Debug = ENABLE_WEB_RTC;

Modified: trunk/Source/WebCore/PAL/ChangeLog (213122 => 213123)


--- trunk/Source/WebCore/PAL/ChangeLog	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebCore/PAL/ChangeLog	2017-02-28 07:11:13 UTC (rev 213123)
@@ -1,5 +1,14 @@
 2017-02-27  Alex Christensen  <[email protected]>
 
+        Begin enabling WebRTC on 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=168915
+
+        Reviewed by Eric Carlson.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2017-02-27  Alex Christensen  <[email protected]>
+
         [libwebrtc] Enable WebRTC in some Production Builds
         https://bugs.webkit.org/show_bug.cgi?id=168858
 

Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (213122 => 213123)


--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2017-02-28 07:11:13 UTC (rev 213123)
@@ -164,6 +164,12 @@
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 
+ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
+ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios_11_Debug = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Release = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Production = ;
 ENABLE_WEB_RTC[sdk=macosx*] = $(ENABLE_WEB_RTC_macosx);
 ENABLE_WEB_RTC_macosx[arch=x86_64] = $(ENABLE_WEB_RTC_macosx_$(CONFIGURATION));
 ENABLE_WEB_RTC_macosx_Debug = ENABLE_WEB_RTC;

Modified: trunk/Source/WebKit/mac/ChangeLog (213122 => 213123)


--- trunk/Source/WebKit/mac/ChangeLog	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebKit/mac/ChangeLog	2017-02-28 07:11:13 UTC (rev 213123)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <[email protected]>
+
+        Begin enabling WebRTC on 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=168915
+
+        Reviewed by Eric Carlson.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-02-27  Aakash Jain  <[email protected]>
 
         Enable SUPPORTS_TEXT_BASED_API in WebKitLegacy for iOS

Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (213122 => 213123)


--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2017-02-28 07:11:13 UTC (rev 213123)
@@ -164,6 +164,12 @@
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 
+ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
+ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios_11_Debug = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Release = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Production = ;
 ENABLE_WEB_RTC[sdk=macosx*] = $(ENABLE_WEB_RTC_macosx);
 ENABLE_WEB_RTC_macosx[arch=x86_64] = $(ENABLE_WEB_RTC_macosx_$(CONFIGURATION));
 ENABLE_WEB_RTC_macosx_Debug = ENABLE_WEB_RTC;

Modified: trunk/Source/WebKit2/ChangeLog (213122 => 213123)


--- trunk/Source/WebKit2/ChangeLog	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebKit2/ChangeLog	2017-02-28 07:11:13 UTC (rev 213123)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <[email protected]>
+
+        Begin enabling WebRTC on 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=168915
+
+        Reviewed by Eric Carlson.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-02-27  Alexey Proskuryakov  <[email protected]>
 
         Remove _WKWebsiteDataRecord.h

Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (213122 => 213123)


--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2017-02-28 07:11:13 UTC (rev 213123)
@@ -164,6 +164,12 @@
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 
+ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
+ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios_11_Debug = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Release = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Production = ;
 ENABLE_WEB_RTC[sdk=macosx*] = $(ENABLE_WEB_RTC_macosx);
 ENABLE_WEB_RTC_macosx[arch=x86_64] = $(ENABLE_WEB_RTC_macosx_$(CONFIGURATION));
 ENABLE_WEB_RTC_macosx_Debug = ENABLE_WEB_RTC;

Modified: trunk/Tools/ChangeLog (213122 => 213123)


--- trunk/Tools/ChangeLog	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Tools/ChangeLog	2017-02-28 07:11:13 UTC (rev 213123)
@@ -1,3 +1,13 @@
+2017-02-27  Alex Christensen  <[email protected]>
+
+        Begin enabling WebRTC on 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=168915
+
+        Reviewed by Eric Carlson.
+
+        * Scripts/build-webkit:
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2017-02-27  Srinivasan Vijayaraghavan  <[email protected]>
 
         Windows regression: webkitpy.tool.steps.steps_unittest.StepsTest.test_runtests_jsc[_debug]

Modified: trunk/Tools/Scripts/build-webkit (213122 => 213123)


--- trunk/Tools/Scripts/build-webkit	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Tools/Scripts/build-webkit	2017-02-28 07:11:13 UTC (rev 213123)
@@ -63,7 +63,7 @@
 my $coverageSupport = 0;
 my $shouldRunStaticAnalyzer = 0;
 my $startTime = time();
-my $archsi386 = 0;
+my $archs32bit = 0;
 
 my @features = getFeatureOptionList();
 
@@ -74,8 +74,8 @@
 foreach (@ARGV) {
     if ($_ eq '--minimal') {
         $minimal = 1;
-    } elsif ($_ eq 'ARCHS=i386') {
-        $archsi386 = 1;
+    } elsif ($_ eq 'ARCHS=i386' or $_ eq 'ARCHS=armv7' or $_ eq 'ARCHS=armv7s') {
+        $archs32bit = 1;
     }
 }
 
@@ -187,7 +187,8 @@
 
     # ANGLE and libwebrtc must come before WebCore
     splice @projects, 0, 0, ("Source/ThirdParty/ANGLE");
-    if (portName() eq Mac and not architecture() eq "i386" and not $archsi386) {
+    if (not $archs32bit and ((portName() eq Mac and not architecture() eq "i386") or 
+        (portName() eq iOS and (architecture() eq "arm64" or architecture() eq "x86_64")))) {
         splice @projects, 0, 0, ("Source/ThirdParty/libwebrtc");
     }
 

Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (213122 => 213123)


--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2017-02-28 05:01:45 UTC (rev 213122)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2017-02-28 07:11:13 UTC (rev 213123)
@@ -164,6 +164,12 @@
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 
+ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
+ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios_11_Debug = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Release = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC_ios_11_Production = ;
 ENABLE_WEB_RTC[sdk=macosx*] = $(ENABLE_WEB_RTC_macosx);
 ENABLE_WEB_RTC_macosx[arch=x86_64] = $(ENABLE_WEB_RTC_macosx_$(CONFIGURATION));
 ENABLE_WEB_RTC_macosx_Debug = ENABLE_WEB_RTC;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to