Begin enabling WebRTC on 64-bit
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Feb 2017 07:11:13 +0000 (07:11 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Feb 2017 07:11:13 +0000 (07:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=168915

Reviewed by Eric Carlson.

Source/JavaScriptCore:

* 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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@213123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Tools/ChangeLog
Tools/Scripts/build-webkit
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index 1614f57..67665ad 100644 (file)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <achristensen@webkit.org>
+
+        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  <mark.lam@apple.com>
 
         Introduce a VM Traps mechanism and refactor Watchdog to use it.
index b22d35d..258c039 100644 (file)
@@ -164,6 +164,12 @@ ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
 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;
index f51f144..2b1a433 100644 (file)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <achristensen@webkit.org>
+
+        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  <graouts@apple.com>
 
         [Modern Media Controls] Use compact mode by default on macOS
index b22d35d..258c039 100644 (file)
@@ -164,6 +164,12 @@ ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
 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;
index 556231e..491e24e 100644 (file)
@@ -1,5 +1,14 @@
 2017-02-27  Alex Christensen  <achristensen@webkit.org>
 
+        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  <achristensen@webkit.org>
+
         [libwebrtc] Enable WebRTC in some Production Builds
         https://bugs.webkit.org/show_bug.cgi?id=168858
 
index b22d35d..258c039 100644 (file)
@@ -164,6 +164,12 @@ ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
 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;
index f0e25a0..d479d8c 100644 (file)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <achristensen@webkit.org>
+
+        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  <aakash_jain@apple.com>
 
         Enable SUPPORTS_TEXT_BASED_API in WebKitLegacy for iOS
index b22d35d..258c039 100644 (file)
@@ -164,6 +164,12 @@ ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
 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;
index 3b419f4..bb30252 100644 (file)
@@ -1,3 +1,12 @@
+2017-02-27  Alex Christensen  <achristensen@webkit.org>
+
+        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  <ap@apple.com>
 
         Remove _WKWebsiteDataRecord.h
index b22d35d..258c039 100644 (file)
@@ -164,6 +164,12 @@ ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
 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;
index 7553b07..02ab9ec 100644 (file)
@@ -1,3 +1,13 @@
+2017-02-27  Alex Christensen  <achristensen@webkit.org>
+
+        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  <svijayaraghavan@apple.com>
 
         Windows regression: webkitpy.tool.steps.steps_unittest.StepsTest.test_runtests_jsc[_debug]
index 749a732..032452d 100755 (executable)
@@ -63,7 +63,7 @@ my $onlyWebKitProject = 0;
 my $coverageSupport = 0;
 my $shouldRunStaticAnalyzer = 0;
 my $startTime = time();
-my $archsi386 = 0;
+my $archs32bit = 0;
 
 my @features = getFeatureOptionList();
 
@@ -74,8 +74,8 @@ push @ARGV, split(/ /, $ENV{'BUILD_WEBKIT_ARGS'}) if ($ENV{'BUILD_WEBKIT_ARGS'})
 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 @@ if (isAppleCocoaWebKit()) {
 
     # 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");
     }
 
index b22d35d..258c039 100644 (file)
@@ -164,6 +164,12 @@ ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
 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;