Title: [237913] trunk/Tools
- Revision
- 237913
- Author
- jbed...@apple.com
- Date
- 2018-11-06 21:01:30 -0800 (Tue, 06 Nov 2018)
Log Message
webkitpy: Generalize trailing SDK specifier (Part 2)
https://bugs.webkit.org/show_bug.cgi?id=191275
<rdar://problem/45703660>
Reviewed by Aakash Jain.
* Scripts/webkitpy/port/ios_device.py:
(IOSDevicePort): Use normalized SDK.
* Scripts/webkitpy/port/ios_simulator.py:
(IOSSimulatorPort): Use normalized SDK.
(IOSSimulatorPort._build_driver_flags): Use platform SDK in build driver flags.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (237912 => 237913)
--- trunk/Tools/ChangeLog 2018-11-07 04:37:04 UTC (rev 237912)
+++ trunk/Tools/ChangeLog 2018-11-07 05:01:30 UTC (rev 237913)
@@ -1,3 +1,17 @@
+2018-11-06 Jonathan Bedard <jbed...@apple.com>
+
+ webkitpy: Generalize trailing SDK specifier (Part 2)
+ https://bugs.webkit.org/show_bug.cgi?id=191275
+ <rdar://problem/45703660>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/webkitpy/port/ios_device.py:
+ (IOSDevicePort): Use normalized SDK.
+ * Scripts/webkitpy/port/ios_simulator.py:
+ (IOSSimulatorPort): Use normalized SDK.
+ (IOSSimulatorPort._build_driver_flags): Use platform SDK in build driver flags.
+
2018-11-06 Justin Fan <justin_...@apple.com>
[WebGPU] Experimental prototype for WebGPURenderPipeline and WebGPUSwapChain
Modified: trunk/Tools/Scripts/webkitpy/port/ios_device.py (237912 => 237913)
--- trunk/Tools/Scripts/webkitpy/port/ios_device.py 2018-11-07 04:37:04 UTC (rev 237912)
+++ trunk/Tools/Scripts/webkitpy/port/ios_device.py 2018-11-07 05:01:30 UTC (rev 237913)
@@ -38,7 +38,7 @@
ARCHITECTURES = ['armv7', 'armv7s', 'arm64']
DEFAULT_ARCHITECTURE = 'arm64'
VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8', 'ios-9', 'ios-10']
- SDK = apple_additions().ios_device_SDK() if apple_additions() else 'iphoneos'
+ SDK = apple_additions().get_sdk('iphoneos') if apple_additions() else 'iphoneos'
NO_ON_DEVICE_TESTING = 'On-device testing is not supported on this machine'
@memoized
Modified: trunk/Tools/Scripts/webkitpy/port/ios_simulator.py (237912 => 237913)
--- trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2018-11-07 04:37:04 UTC (rev 237912)
+++ trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2018-11-07 05:01:30 UTC (rev 237913)
@@ -24,6 +24,7 @@
from webkitpy.common.memoized import memoized
from webkitpy.common.version import Version
+from webkitpy.port.config import apple_additions
from webkitpy.port.ios import IOSPort
from webkitpy.xcode.device_type import DeviceType
from webkitpy.xcode.simulated_device import DeviceRequest, SimulatedDeviceManager
@@ -41,7 +42,7 @@
DEFAULT_DEVICE_CLASS = 'iPhone SE'
CUSTOM_DEVICE_CLASSES = ['iPad', 'iPhone 7']
- SDK = 'iphonesimulator'
+ SDK = apple_additions().get_sdk('iphonesimulator') if apple_additions() else 'iphonesimulator'
def __init__(self, host, port_name, **kwargs):
super(IOSSimulatorPort, self).__init__(host, port_name, **kwargs)
@@ -81,7 +82,7 @@
def _build_driver_flags(self):
archs = ['ARCHS=i386'] if self.architecture() == 'x86' else []
- sdk = ['--sdk', 'iphonesimulator']
+ sdk = ['--sdk', self.SDK]
return archs + sdk
def _set_device_class(self, device_class):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
