Update the location for XProtect.meta.plist file
authorkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Mar 2019 19:52:40 +0000 (19:52 +0000)
committerkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Mar 2019 19:52:40 +0000 (19:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=195764

Reviewed by Alexey Proskuryakov.

The location of this file is changing in the future, so adjust for
that.

No new tests since there should be no observable behavior difference.

* platform/mac/BlacklistUpdater.mm:

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

Source/WebCore/ChangeLog
Source/WebCore/platform/mac/BlacklistUpdater.mm

index c368467..3164248 100644 (file)
@@ -1,3 +1,17 @@
+2019-03-20  Keith Rollin  <krollin@apple.com>
+
+        Update the location for XProtect.meta.plist file
+        https://bugs.webkit.org/show_bug.cgi?id=195764
+
+        Reviewed by Alexey Proskuryakov.
+
+        The location of this file is changing in the future, so adjust for
+        that.
+
+        No new tests since there should be no observable behavior difference.
+
+        * platform/mac/BlacklistUpdater.mm:
+
 2019-03-20  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: Database: lazily create the agent
index 940f829..2608b35 100644 (file)
@@ -43,7 +43,11 @@ const time_t blacklistCheckTimeInterval = 60 * 10;
 // The time when we last re-parsed the blacklist file.
 static time_t blacklistUpdateTime;
 
+#if HAVE(ALTERNATE_SYSTEM_LAYOUT)
+NSString * const blacklistPath = @"/Library/Apple/System/Library/CoreServices/XProtect.bundle/Contents/Resources/XProtect.meta.plist";
+#else
 NSString * const blacklistPath = @"/System/Library/CoreServices/XProtect.bundle/Contents/Resources/XProtect.meta.plist";
+#endif
 
 namespace WebCore {