<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183929] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183929">183929</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-05-07 09:26:59 -0700 (Thu, 07 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>&lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
https://bugs.webkit.org/show_bug.cgi?id=144727

Reviewed by Darin Adler.

Source/bmalloc:

* Configurations/Base.xcconfig: Dont’s include AspenFamily.xcconfig, and define
INSTALL_PATH_PREFIX for the iOS 8.x Simulator.

Source/JavaScriptCore:

* Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.

Source/PAL:

* Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
INSTALL_PATH_PREFIX for the iOS 8.x Simulator.

Source/ThirdParty:

* gtest/xcode/Config/General.xcconfig: Don’t include AspenFamily.xcconfig.

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.

Source/WebCore:

* Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig.
* Configurations/WebCore.xcconfig: For iOS, define INSTALL_PATH in terms of
INSTALL_PATH_PREFIX, and set INSTALL_PATH_PREFIX for the iOS 8.x Simulator.
* Configurations/WebCoreTestSupport.xcconfig: Define INSTALL_PATH in terms of
INSTALL_PATH_PREFIX and INSTALL_PATH_ACTUAL, and define INSTALL_PATH_PREFIX for the iOS 8.x
Simulator.

Source/WebKit/mac:

* Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig.
* Configurations/WebKitLegacy.xcconfig: Define INSTALL_PATH in terms of
INSTALL_PATH_PREFIX and INSTALL_PATH_ACTUAL, and define INSTALL_PATH_PREFIX for the iOS 8.x
Simulator.

Source/WebKit2:

* Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
* Configurations/WebKit2.xcconfig: Define INSTALL_PATH_ACTUAL and let INSTALL_PATH be
derived from it and INSTALL_PATH_PREFIX. Don’t override DYLIB_INSTALL_NAME_BASE for iOS,
because we define LD_DYLIB_INSTALL_NAME directly where needed.

Source/WTF:

* Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsBasexcconfig">trunk/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourcePALChangeLog">trunk/Source/PAL/ChangeLog</a></li>
<li><a href="#trunkSourcePALConfigurationsBasexcconfig">trunk/Source/PAL/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEConfigurationsBasexcconfig">trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyChangeLog">trunk/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig">trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFConfigurationsBasexcconfig">trunk/Source/WTF/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsBasexcconfig">trunk/Source/WebCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCoreTestSupportxcconfig">trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsBasexcconfig">trunk/Source/WebKit/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig">trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBasexcconfig">trunk/Source/WebKit2/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKit2xcconfig">trunk/Source/WebKit2/Configurations/WebKit2.xcconfig</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocConfigurationsBasexcconfig">trunk/Source/bmalloc/Configurations/Base.xcconfig</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+        INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+
</ins><span class="cx"> 2015-05-07  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Special-case Int32 values in JSON.stringify().
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/JavaScriptCore/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span><span class="lines">@@ -134,8 +133,12 @@
</span><span class="cx"> 
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx"> 
</span><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><span class="cx"> 
</span><ins>+LD_DYLIB_INSTALL_NAME[sdk=iphonesimulator8.*]=$(LD_DYLIB_INSTALL_NAME_$(MACH_O_TYPE));
+LD_DYLIB_INSTALL_NAME_mh_dylib=$(INSTALL_PATH_ACTUAL)/$(EXECUTABLE_PATH);
+
</ins><span class="cx"> OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
</span><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
</span></span></pre></div>
<a id="trunkSourcePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/PAL/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PAL/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/PAL/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+        INSTALL_PATH_PREFIX for the iOS 8.x Simulator.
+
</ins><span class="cx"> 2015-04-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Introducing the Platform Abstraction Layer (PAL)
</span></span></pre></div>
<a id="trunkSourcePALConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/PAL/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PAL/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/PAL/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span><span class="lines">@@ -110,6 +109,7 @@
</span><span class="cx"> DEAD_CODE_STRIPPING_normal = YES;
</span><span class="cx"> DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
</span><span class="cx"> 
</span><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><span class="cx"> 
</span><span class="cx"> SDKROOT = macosx.internal;
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+        INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+
</ins><span class="cx"> 2015-04-01  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Progress towards CMake on Windows and Mac.
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span><span class="lines">@@ -48,6 +47,7 @@
</span><span class="cx"> 
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx"> 
</span><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><span class="cx"> 
</span><span class="cx"> SDKROOT = macosx.internal;
</span></span></pre></div>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * gtest/xcode/Config/General.xcconfig: Don’t include AspenFamily.xcconfig.
+
</ins><span class="cx"> 2015-04-01  Gyuyoung Kim  &lt;gyuyoung.kim@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [CMake] Make gtest/CMakeLists.txt more readable
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -7,8 +7,6 @@
</span><span class="cx"> //  http://code.google.com/p/google-toolbox-for-mac/
</span><span class="cx"> //
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
-
</del><span class="cx"> GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
</span><span class="cx"> 
</span><span class="cx"> ARCHS = $(ARCHS_STANDARD_32_64_BIT);
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WTF/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+        INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+
</ins><span class="cx"> 2015-05-07  Žan Doberšek  &lt;zdobersek@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Clean up RunLoop implementation
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WTF/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span><span class="lines">@@ -110,6 +109,7 @@
</span><span class="cx"> DEAD_CODE_STRIPPING_normal = YES;
</span><span class="cx"> DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
</span><span class="cx"> 
</span><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><span class="cx"> 
</span><span class="cx"> SDKROOT = macosx.internal;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig.
+        * Configurations/WebCore.xcconfig: For iOS, define INSTALL_PATH in terms of
+        INSTALL_PATH_PREFIX, and set INSTALL_PATH_PREFIX for the iOS 8.x Simulator.
+        * Configurations/WebCoreTestSupport.xcconfig: Define INSTALL_PATH in terms of
+        INSTALL_PATH_PREFIX and INSTALL_PATH_ACTUAL, and define INSTALL_PATH_PREFIX for the iOS 8.x
+        Simulator.
+
</ins><span class="cx"> 2015-05-07  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Mac] Playback target isn't set on new element
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> 
</span><span class="cx"> HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 &quot;$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore&quot; &quot;$(BUILT_PRODUCTS_DIR)/usr/local/include&quot; $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
</span><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><del>-INSTALL_PATH[sdk=iphoneos*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx"> INSTALL_PATH[sdk=macosx*] = $(WEBCORE_FRAMEWORKS_DIR);
</span><del>-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCoreTestSupportxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -27,13 +27,12 @@
</span><span class="cx"> PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(CONFIGURATION));
</span><span class="cx"> PRIVATE_HEADERS_FOLDER_PATH_Debug = WebCoreTestSupport;
</span><span class="cx"> PRIVATE_HEADERS_FOLDER_PATH_Release = $(PRIVATE_HEADERS_FOLDER_PATH_Debug);
</span><del>-PRIVATE_HEADERS_FOLDER_PATH_Production[sdk=iphonesimulator*] = $(INDIGO_INSTALL_PATH_PREFIX)/usr/local/include/WebCoreTestSupport;
-PRIVATE_HEADERS_FOLDER_PATH_Production = /usr/local/include/WebCoreTestSupport;
</del><ins>+PRIVATE_HEADERS_FOLDER_PATH_Production = $(INSTALL_PATH_PREFIX)/usr/local/include/WebCoreTestSupport;
</ins><span class="cx"> 
</span><span class="cx"> // Use [sdk=] selectors to override settings in WebCore.xcconfig.
</span><del>-INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
-INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
</del><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
+INSTALL_PATH_ACTUAL = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
</ins><span class="cx"> INSTALL_PATH_WebCoreTestSupport_Production = /usr/local/lib;
</span><span class="cx"> 
</span><span class="cx"> SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig.
+        * Configurations/WebKitLegacy.xcconfig: Define INSTALL_PATH in terms of
+        INSTALL_PATH_PREFIX and INSTALL_PATH_ACTUAL, and define INSTALL_PATH_PREFIX for the iOS 8.x
+        Simulator.
+
</ins><span class="cx"> 2015-04-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Introducing the Platform Abstraction Layer (PAL)
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -56,10 +56,9 @@
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
</span><span class="cx"> HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu &quot;$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy&quot; &quot;$(BUILT_PRODUCTS_DIR)/usr/local/include&quot; $(HEADER_SEARCH_PATHS);
</span><span class="cx"> INFOPLIST_FILE = mac/Info.plist;
</span><del>-INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_ios);
</del><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx"> INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
</span><del>-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_ios);
-INSTALL_PATH_ios = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><span class="cx"> 
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME)_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING));
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit2/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+        INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+        * Configurations/WebKit2.xcconfig: Define INSTALL_PATH_ACTUAL and let INSTALL_PATH be
+        derived from it and INSTALL_PATH_PREFIX. Don’t override DYLIB_INSTALL_NAME_BASE for iOS,
+        because we define LD_DYLIB_INSTALL_NAME directly where needed.
+
</ins><span class="cx"> 2015-05-07  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.1 release.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span><span class="lines">@@ -98,8 +97,12 @@
</span><span class="cx"> // building the MiG bindings for WebKitPluginClient even when the functions that the bindings wrap are not built.
</span><span class="cx"> DEAD_CODE_STRIPPING = YES;
</span><span class="cx"> 
</span><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><span class="cx"> 
</span><ins>+LD_DYLIB_INSTALL_NAME[sdk=iphonesimulator8.*]=$(LD_DYLIB_INSTALL_NAME_$(MACH_O_TYPE));
+LD_DYLIB_INSTALL_NAME_mh_dylib=$(INSTALL_PATH_ACTUAL)/$(EXECUTABLE_PATH);
+
</ins><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx"> 
</span><span class="cx"> CODE_SIGN_IDENTITY = -;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKit2xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -28,12 +28,9 @@
</span><span class="cx"> 
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) -framework WebKit -sub_umbrella WebKit;
</span><span class="cx"> 
</span><del>-INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_ios);
-INSTALL_PATH[sdk=macosx*] = $(WEBKIT2_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_ios);
-INSTALL_PATH_ios = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+INSTALL_PATH_ACTUAL = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_ACTUAL[sdk=macosx*] = $(WEBKIT2_FRAMEWORKS_DIR);
</ins><span class="cx"> 
</span><del>-DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><span class="cx"> DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
</span><span class="cx"> 
</span><span class="cx"> SKIP_INSTALL = YES;
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/bmalloc/ChangeLog        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        &lt;rdar://problem/19317140&gt; [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+        https://bugs.webkit.org/show_bug.cgi?id=144727
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Dont’s include AspenFamily.xcconfig, and define
+        INSTALL_PATH_PREFIX for the iOS 8.x Simulator.
+
</ins><span class="cx"> 2015-04-01  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Progress towards CMake on Windows and Mac.
</span></span></pre></div>
<a id="trunkSourcebmallocConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (183928 => 183929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/Configurations/Base.xcconfig        2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig        2015-05-07 16:26:59 UTC (rev 183929)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
</span><span class="cx"> 
</span><del>-#include &quot;&lt;DEVELOPER_DIR&gt;/AppleInternal/XcodeConfig/AspenFamily.xcconfig&quot;
</del><span class="cx"> #include &quot;../../../../Internal/Configurations/HaveInternalSDK.xcconfig&quot;
</span><span class="cx"> 
</span><span class="cx"> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
</span><span class="lines">@@ -105,6 +104,7 @@
</span><span class="cx"> DEAD_CODE_STRIPPING_normal = YES;
</span><span class="cx"> DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
</span><span class="cx"> 
</span><ins>+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><span class="cx"> 
</span><span class="cx"> SDKROOT = macosx.internal;
</span></span></pre>
</div>
</div>

</body>
</html>