Unreviewed, rolling out r192073.
https://bugs.webkit.org/show_bug.cgi?id=150962

"Broke the internal iOS build; will investigate offline"
(Requested by dydz on #webkit).

Reverted changeset:

"Teach Makefile to build LayoutTestRelay when building for iOS
Simulator"
https://bugs.webkit.org/show_bug.cgi?id=150849
http://trac.webkit.org/changeset/192073

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@192084 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3e07a48..3d347c6 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2015-11-05  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r192073.
+        https://bugs.webkit.org/show_bug.cgi?id=150962
+
+        "Broke the internal iOS build; will investigate offline"
+        (Requested by dydz on #webkit).
+
+        Reverted changeset:
+
+        "Teach Makefile to build LayoutTestRelay when building for iOS
+        Simulator"
+        https://bugs.webkit.org/show_bug.cgi?id=150849
+        http://trac.webkit.org/changeset/192073
+
 2015-11-05  Daniel Bates  <dabates@apple.com>
 
         Teach Makefile to build LayoutTestRelay when building for iOS Simulator
diff --git a/Tools/LayoutTestRelay/Makefile b/Tools/LayoutTestRelay/Makefile
index 51cc915..e489fc4 100644
--- a/Tools/LayoutTestRelay/Makefile
+++ b/Tools/LayoutTestRelay/Makefile
@@ -1,15 +1,3 @@
 SCRIPTS_PATH = ../Scripts
 
-ifneq (,$(SDKROOT))
-	ifeq ($(findstring iphonesimulator,$(SDKROOT)),iphonesimulator)
-		SAVED_SDK_ROOT = $(SDKROOT)
-		override SDKROOT =
-	endif
-endif
-
 include ../../Makefile.shared
-
-ifneq (,$(SAVED_SDK_ROOT))
-	override SDKROOT = $(SAVED_SDK_ROOT)
-	undefine SAVED_SDK_ROOT
-endif
diff --git a/Tools/Makefile b/Tools/Makefile
index 1540d16..dcdb4d8 100644
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -4,9 +4,6 @@
 	ifeq (,$(findstring macosx,$(SDKROOT)))
 		MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
 	endif
-	ifeq ($(findstring iphonesimulator,$(SDKROOT)),iphonesimulator)
-		MODULES += LayoutTestRelay
-	endif
 endif
 
 all: