Title: [294091] branches/safari-7614.1.13-branch/Source/WebKit
- Revision
- 294091
- Author
- [email protected]
- Date
- 2022-05-11 21:46:10 -0700 (Wed, 11 May 2022)
Log Message
Cherry-pick r293936. rdar://problem/92859012
Fix adattributiond build in internal build on older macOS
https://bugs.webkit.org/show_bug.cgi?id=240184
<rdar://92859012>
Patch by Alex Christensen <[email protected]> on 2022-05-06
Reviewed by Alexey Proskuryakov.
We need to search for WK_OVERRIDE_FRAMEWORKS_DIR to find the right frameworks
* Configurations/adattributiond.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293936 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog (294090 => 294091)
--- branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog 2022-05-12 04:33:35 UTC (rev 294090)
+++ branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog 2022-05-12 04:46:10 UTC (rev 294091)
@@ -1,3 +1,32 @@
+2022-05-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r293936. rdar://problem/92859012
+
+ Fix adattributiond build in internal build on older macOS
+ https://bugs.webkit.org/show_bug.cgi?id=240184
+ <rdar://92859012>
+
+ Patch by Alex Christensen <[email protected]> on 2022-05-06
+ Reviewed by Alexey Proskuryakov.
+
+ We need to search for WK_OVERRIDE_FRAMEWORKS_DIR to find the right frameworks
+
+ * Configurations/adattributiond.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293936 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-05-06 Alex Christensen <[email protected]>
+
+ Fix adattributiond build in internal build on older macOS
+ https://bugs.webkit.org/show_bug.cgi?id=240184
+ <rdar://92859012>
+
+ Reviewed by Alexey Proskuryakov.
+
+ We need to search for WK_OVERRIDE_FRAMEWORKS_DIR to find the right frameworks
+
+ * Configurations/adattributiond.xcconfig:
+
2022-05-06 Brent Fulgham <[email protected]>
Remove unused ApplePayRemoteUIEnabled preference
Modified: branches/safari-7614.1.13-branch/Source/WebKit/Configurations/adattributiond.xcconfig (294090 => 294091)
--- branches/safari-7614.1.13-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-05-12 04:33:35 UTC (rev 294090)
+++ branches/safari-7614.1.13-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-05-12 04:46:10 UTC (rev 294091)
@@ -35,4 +35,9 @@
WK_CODE_SIGN_FLAGS_iphoneos = --entitlements $(WK_PROCESSED_XCENT_FILE);
OTHER_CODE_SIGN_FLAGS = $(WK_CODE_SIGN_FLAGS);
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_OVERRIDE_FRAMEWORKS_DIR)
+
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Daemons;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
