Stop using deprecated target conditional for simulator builds
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Dec 2017 20:10:03 +0000 (20:10 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Dec 2017 20:10:03 +0000 (20:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180662
<rdar://problem/35136156>

Reviewed by Simon Fraser.

PerformanceTests:

* StitchMarker/wtf/Platform.h:
* StitchMarker/wtf/dependencies/bmalloc/BPlatform.h:

Source/bmalloc:

* bmalloc/BPlatform.h:

Source/ThirdParty/libwebrtc:

* Source/third_party/libyuv/source/mjpeg_decoder.cc:
* Source/webrtc/examples/objc/AppRTCMobile/ARDAppClient.m:
(-[ARDAppClient createLocalVideoTrack]):
* Source/webrtc/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm:
* Source/webrtc/modules/audio_device/ios/audio_device_ios.mm:
(webrtc::LogDeviceInfo):

Source/WebKitLegacy/mac:

* postprocess-headers.sh:

Source/WTF:

* wtf/Platform.h:

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

14 files changed:
PerformanceTests/ChangeLog
PerformanceTests/StitchMarker/wtf/Platform.h
PerformanceTests/StitchMarker/wtf/dependencies/bmalloc/BPlatform.h
Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Source/third_party/libyuv/source/mjpeg_decoder.cc
Source/ThirdParty/libwebrtc/Source/webrtc/examples/objc/AppRTCMobile/ARDAppClient.m
Source/ThirdParty/libwebrtc/Source/webrtc/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/audio_device_ios.mm
Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/postprocess-headers.sh
Source/bmalloc/ChangeLog
Source/bmalloc/bmalloc/BPlatform.h

index beb2b3b..c5d0e17 100644 (file)
@@ -1,3 +1,14 @@
+2017-12-11  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using deprecated target conditional for simulator builds
+        https://bugs.webkit.org/show_bug.cgi?id=180662
+        <rdar://problem/35136156>
+
+        Reviewed by Simon Fraser.
+
+        * StitchMarker/wtf/Platform.h:
+        * StitchMarker/wtf/dependencies/bmalloc/BPlatform.h:
+
 2017-12-11  Antti Koivisto  <antti@apple.com>
 
         StyleBench improvements
index 802f525..f54fdc0 100644 (file)
 /* OS(MAC_OS_X) - Mac OS X (not including iOS) */
 #if OS(DARWIN) && ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
     || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)                 \
-    || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))
+    || (defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR))
 #define WTF_OS_IOS 1
 #elif OS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC
 #define WTF_OS_MAC_OS_X 1
 #define WTF_PLATFORM_MAC 1
 #elif OS(IOS)
 #define WTF_PLATFORM_IOS 1
-#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
+#if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
 #define WTF_PLATFORM_IOS_SIMULATOR 1
 #endif
 #elif OS(WINDOWS)
index 5fa9ef4..d479f40 100644 (file)
@@ -48,9 +48,9 @@
 
 #if BOS(DARWIN) && ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
     || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \
-    || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))
+    || (defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR))
 #define BPLATFORM_IOS 1
-#if (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
+#if (defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR)
 #define BPLATFORM_IOS_SIMULATOR 1
 #endif
 #elif BOS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC
index 3f53669..ccfb38d 100644 (file)
@@ -1,3 +1,18 @@
+2017-12-11  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using deprecated target conditional for simulator builds
+        https://bugs.webkit.org/show_bug.cgi?id=180662
+        <rdar://problem/35136156>
+
+        Reviewed by Simon Fraser.
+
+        * Source/third_party/libyuv/source/mjpeg_decoder.cc:
+        * Source/webrtc/examples/objc/AppRTCMobile/ARDAppClient.m:
+        (-[ARDAppClient createLocalVideoTrack]):
+        * Source/webrtc/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm:
+        * Source/webrtc/modules/audio_device/ios/audio_device_ios.mm:
+        (webrtc::LogDeviceInfo):
+
 2017-11-06  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r224497.
index b43c008..d341da3 100644 (file)
@@ -14,7 +14,7 @@
 #include <assert.h>
 
 #if !defined(__pnacl__) && !defined(__CLR_VER) && \
-    !defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR)
+    !defined(COVERAGE_ENABLED) && !defined(TARGET_OS_SIMULATOR)
 // Must be included before jpeglib.
 #include <setjmp.h>
 #define HAVE_SETJMP
index 7e9fbda..9d029c2 100644 (file)
@@ -709,7 +709,7 @@ static int const kKbpsMultiplier = 1000;
   // The iOS simulator doesn't provide any sort of camera capture
   // support or emulation (http://goo.gl/rHAnC1) so don't bother
   // trying to open a local stream.
-#if !TARGET_IPHONE_SIMULATOR
+#if !TARGET_OS_SIMULATOR
   if (![_settings currentAudioOnlySettingFromStore]) {
     RTCVideoSource *source = [_factory videoSource];
     RTCCameraVideoCapturer *capturer = [[RTCCameraVideoCapturer alloc] initWithDelegate:source];
index b1ce5f0..daeef68 100644 (file)
 // Test to see that we get a local video connection
 // Note this will currently pass even when no camera is connected as a local
 // video track is created regardless (Perhaps there should be a test for that...)
-#if !TARGET_IPHONE_SIMULATOR // Expect to fail on simulator due to no camera support
+#if !TARGET_OS_SIMULATOR // Expect to fail on simulator due to no camera support
 - (void)testSessionShouldGetLocalVideoTrackCallback {
   ARDAppClient *caller = nil;
   NSString *roomId = @"testRoom";
index de05bf1..3493030 100644 (file)
@@ -97,8 +97,8 @@ static void LogDeviceInfo() {
     && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0
     LOG(LS_INFO) << " low power mode: " << ios::GetLowPowerModeEnabled();
 #endif
-#if TARGET_IPHONE_SIMULATOR
-    LOG(LS_INFO) << " TARGET_IPHONE_SIMULATOR is defined";
+#if TARGET_OS_SIMULATOR
+    LOG(LS_INFO) << " TARGET_OS_SIMULATOR is defined";
 #endif
     LOG(LS_INFO) << " DeviceIsSimulator: " << DeviceIsSimulator();
   }
index 4b1457b..8c8eefa 100644 (file)
@@ -1,3 +1,13 @@
+2017-12-11  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using deprecated target conditional for simulator builds
+        https://bugs.webkit.org/show_bug.cgi?id=180662
+        <rdar://problem/35136156>
+
+        Reviewed by Simon Fraser.
+
+        * wtf/Platform.h:
+
 2017-12-11  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [WTF] Add Converter traits to StringHasher instead of function pointer
index 566a879..aa84d90 100644 (file)
 #define WTF_PLATFORM_MAC 1
 #elif OS(IOS)
 #define WTF_PLATFORM_IOS 1
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
 #define WTF_PLATFORM_IOS_SIMULATOR 1
 #endif
 #elif OS(WINDOWS)
index 1fde258..f75c0fa 100644 (file)
@@ -1,3 +1,13 @@
+2017-12-11  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using deprecated target conditional for simulator builds
+        https://bugs.webkit.org/show_bug.cgi?id=180662
+        <rdar://problem/35136156>
+
+        Reviewed by Simon Fraser.
+
+        * postprocess-headers.sh:
+
 2017-12-11  David Quesada  <david_quesada@apple.com>
 
         Turn on ENABLE_APPLICATION_MANIFEST
index 75ed644..e2cce35 100755 (executable)
@@ -15,11 +15,11 @@ postProcessInDirectory()
     fi
 
     if [[ ${PLATFORM_NAME} == macosx ]]; then
-        unifdefOptions="-DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0";
+        unifdefOptions="-DTARGET_OS_IPHONE=0 -DTARGET_OS_SIMULATOR=0";
     elif [[ ${PLATFORM_NAME} == *simulator* ]]; then
-        unifdefOptions="-DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
+        unifdefOptions="-DTARGET_OS_IPHONE=1 -DTARGET_OS_SIMULATOR=1 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
     else
-        unifdefOptions="-DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
+        unifdefOptions="-DTARGET_OS_IPHONE=1 -DTARGET_OS_SIMULATOR=0 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
     fi
 
     # FIXME: We should consider making this logic general purpose so as to support keeping or removing
index 4a69aae..2092c94 100644 (file)
@@ -1,3 +1,13 @@
+2017-12-11  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using deprecated target conditional for simulator builds
+        https://bugs.webkit.org/show_bug.cgi?id=180662
+        <rdar://problem/35136156>
+
+        Reviewed by Simon Fraser.
+
+        * bmalloc/BPlatform.h:
+
 2017-12-08  Saam Barati  <sbarati@apple.com>
 
         Enable gigacage on iOS with a 32GB runway and ensure it doesn't break WasmBench
index f6b560f..0bb453f 100644 (file)
@@ -55,7 +55,7 @@
 #if BOS(DARWIN)
 #if TARGET_OS_IPHONE
 #define BPLATFORM_IOS 1
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
 #define BPLATFORM_IOS_SIMULATOR 1
 #endif
 #elif TARGET_OS_MAC