Remove check for SkipSafariExecutableEntitlementChecks
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Feb 2017 00:09:08 +0000 (00:09 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Feb 2017 00:09:08 +0000 (00:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167762
rdar://problem/22480673

Reviewed by Dan Bernstein.

* Scripts/webkitdirs.pm:
(safariPathFromSafariBundle):
(skipSafariExecutableEntitlementChecks): Deleted.

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

Tools/ChangeLog
Tools/Scripts/webkitdirs.pm

index ff7a0d5..fe94254 100644 (file)
@@ -1,3 +1,15 @@
+2017-02-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Remove check for SkipSafariExecutableEntitlementChecks
+        https://bugs.webkit.org/show_bug.cgi?id=167762
+        rdar://problem/22480673
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/webkitdirs.pm:
+        (safariPathFromSafariBundle):
+        (skipSafariExecutableEntitlementChecks): Deleted.
+
 2017-02-02  Jonathan Bedard  <jbedard@apple.com>
 
         Undefined subroutine in svn-create-patch
index 4dc991a..3f7e38d 100755 (executable)
@@ -846,11 +846,6 @@ sub setArchitecture
     $architecture = $passedArchitecture if $passedArchitecture;
 }
 
-sub skipSafariExecutableEntitlementChecks
-{
-    return `defaults read /Library/Preferences/org.webkit.BuildConfiguration SkipSafariExecutableEntitlementChecks 2>/dev/null` eq "1\n";
-}
-
 sub executableHasEntitlements
 {
     my $executablePath = shift;
@@ -864,9 +859,8 @@ sub safariPathFromSafariBundle
     die "Safari path is only relevant on Apple Mac platform\n" unless isAppleMacWebKit();
 
     my $safariPath = "$safariBundle/Contents/MacOS/Safari";
-    return $safariPath if skipSafariExecutableEntitlementChecks();
-
     my $safariForWebKitDevelopmentPath = "$safariBundle/Contents/MacOS/SafariForWebKitDevelopment";
+
     return $safariForWebKitDevelopmentPath if -f $safariForWebKitDevelopmentPath && executableHasEntitlements($safariPath);
 
     return $safariPath;