Fix build.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jun 2016 00:08:10 +0000 (00:08 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jun 2016 00:08:10 +0000 (00:08 +0000)
Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index ddeefab..0a3738d 100644 (file)
@@ -1,3 +1,9 @@
+2016-06-21  Anders Carlsson  <andersca@apple.com>
+
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2016-06-21  Geoffrey Garen  <ggaren@apple.com>
 
         Options::useImmortalObjects is not safe for conservative GC
index 40c25c5..b6dc152 100644 (file)
@@ -35,7 +35,9 @@ ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
 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))
index ae35eb6..6860e2c 100644 (file)
@@ -1,3 +1,9 @@
+2016-06-21  Anders Carlsson  <andersca@apple.com>
+
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2016-06-21  Jiewen Tan  <jiewen_tan@apple.com>
 
         Unreviewed, rolling out r202302, r202303, r202305, and
index 40c25c5..b6dc152 100644 (file)
@@ -35,7 +35,9 @@ ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
 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))
index 69557d8..b6c371a 100644 (file)
@@ -1,5 +1,11 @@
 2016-06-21  Anders Carlsson  <andersca@apple.com>
 
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2016-06-21  Anders Carlsson  <andersca@apple.com>
+
         Begin moving the Apple Pay code to the open source repository
         https://bugs.webkit.org/show_bug.cgi?id=158998
 
index 40c25c5..b6dc152 100644 (file)
@@ -35,7 +35,9 @@ ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
 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))
index 0244a34..5a8c281 100644 (file)
@@ -1,5 +1,11 @@
 2016-06-21  Anders Carlsson  <andersca@apple.com>
 
+        Fix build.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2016-06-21  Anders Carlsson  <andersca@apple.com>
+
         Begin moving the Apple Pay code to the open source repository
         https://bugs.webkit.org/show_bug.cgi?id=158998
 
index 40c25c5..b6dc152 100644 (file)
@@ -35,7 +35,9 @@ ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
 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))
index 08c5a68..dcb55a7 100644 (file)
@@ -1,5 +1,11 @@
 2016-06-21  Anders Carlsson  <andersca@apple.com>
 
+        Fix build.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+2016-06-21  Anders Carlsson  <andersca@apple.com>
+
         Begin moving the Apple Pay code to the open source repository
         https://bugs.webkit.org/show_bug.cgi?id=158998
 
index 40c25c5..b6dc152 100644 (file)
@@ -35,7 +35,9 @@ ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
 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))