[webkit-changes] [202308] trunk

Tue, 21 Jun 2016 17:09:12 -0700

Title: [202308] trunk
Revision
202308
Author
[email protected]
Date
2016-06-21 17:08:10 -0700 (Tue, 21 Jun 2016)

Log Message

Fix build.

Source/_javascript_Core:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (202307 => 202308)


--- trunk/Source/_javascript_Core/ChangeLog	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-06-22 00:08:10 UTC (rev 202308)
@@ -1,3 +1,9 @@
+2016-06-21  Anders Carlsson  <[email protected]>
+
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2016-06-21  Geoffrey Garen  <[email protected]>
 
         Options::useImmortalObjects is not safe for conservative GC

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (202307 => 202308)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-06-22 00:08:10 UTC (rev 202308)
@@ -35,7 +35,9 @@
 ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY[sdk=iphone*] = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY[sdk=embedded*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))

Modified: trunk/Source/WebCore/ChangeLog (202307 => 202308)


--- trunk/Source/WebCore/ChangeLog	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/WebCore/ChangeLog	2016-06-22 00:08:10 UTC (rev 202308)
@@ -1,3 +1,9 @@
+2016-06-21  Anders Carlsson  <[email protected]>
+
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2016-06-21  Jiewen Tan  <[email protected]>
 
         Unreviewed, rolling out r202302, r202303, r202305, and

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (202307 => 202308)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-06-22 00:08:10 UTC (rev 202308)
@@ -35,7 +35,9 @@
 ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY[sdk=iphone*] = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY[sdk=embedded*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))

Modified: trunk/Source/WebKit/mac/ChangeLog (202307 => 202308)


--- trunk/Source/WebKit/mac/ChangeLog	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-06-22 00:08:10 UTC (rev 202308)
@@ -1,5 +1,11 @@
 2016-06-21  Anders Carlsson  <[email protected]>
 
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2016-06-21  Anders Carlsson  <[email protected]>
+
         Begin moving the Apple Pay code to the open source repository
         https://bugs.webkit.org/show_bug.cgi?id=158998

Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (202307 => 202308)


--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-06-22 00:08:10 UTC (rev 202308)
@@ -35,7 +35,9 @@
 ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY[sdk=iphone*] = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY[sdk=embedded*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))

Modified: trunk/Source/WebKit2/ChangeLog (202307 => 202308)


--- trunk/Source/WebKit2/ChangeLog	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/WebKit2/ChangeLog	2016-06-22 00:08:10 UTC (rev 202308)
@@ -1,5 +1,11 @@
 2016-06-21  Anders Carlsson  <[email protected]>
 
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2016-06-21  Anders Carlsson  <[email protected]>
+
         Begin moving the Apple Pay code to the open source repository
         https://bugs.webkit.org/show_bug.cgi?id=158998

Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (202307 => 202308)


--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-06-22 00:08:10 UTC (rev 202308)
@@ -35,7 +35,9 @@
 ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY[sdk=iphone*] = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY[sdk=embedded*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))

Modified: trunk/Tools/ChangeLog (202307 => 202308)


--- trunk/Tools/ChangeLog	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Tools/ChangeLog	2016-06-22 00:08:10 UTC (rev 202308)
@@ -1,5 +1,11 @@
 2016-06-21  Anders Carlsson  <[email protected]>
 
+        Fix build.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+2016-06-21  Anders Carlsson  <[email protected]>
+
         Begin moving the Apple Pay code to the open source repository
         https://bugs.webkit.org/show_bug.cgi?id=158998

Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (202307 => 202308)


--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2016-06-22 00:04:48 UTC (rev 202307)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2016-06-22 00:08:10 UTC (rev 202308)
@@ -35,7 +35,9 @@
 ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY[sdk=iphone*] = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY[sdk=embedded*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to