Title: [292798] branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc
- Revision
- 292798
- Author
- [email protected]
- Date
- 2022-04-12 21:25:34 -0700 (Tue, 12 Apr 2022)
Log Message
Cherry-pick r292758. rdar://problem/91585769
REGRESSION (r292411): libwebrtc header files aren't installed in system content path
https://bugs.webkit.org/show_bug.cgi?id=239100
Reviewed by Mark Lam.
Restored System Content Path processing for absl and webrtc header files.
* Configurations/libabsl.xcconfig:
* Configurations/libwebrtc.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292758 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/ChangeLog (292797 => 292798)
--- branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-13 04:21:58 UTC (rev 292797)
+++ branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-13 04:25:34 UTC (rev 292798)
@@ -1,3 +1,32 @@
+2022-04-12 Alan Coon <[email protected]>
+
+ Cherry-pick r292758. rdar://problem/91585769
+
+ REGRESSION (r292411): libwebrtc header files aren't installed in system content path
+ https://bugs.webkit.org/show_bug.cgi?id=239100
+
+ Reviewed by Mark Lam.
+
+ Restored System Content Path processing for absl and webrtc header files.
+
+ * Configurations/libabsl.xcconfig:
+ * Configurations/libwebrtc.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292758 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-11 Michael Saboff <[email protected]>
+
+ REGRESSION (r292411): libwebrtc header files aren't installed in system content path
+ https://bugs.webkit.org/show_bug.cgi?id=239100
+
+ Reviewed by Mark Lam.
+
+ Restored System Content Path processing for absl and webrtc header files.
+
+ * Configurations/libabsl.xcconfig:
+ * Configurations/libwebrtc.xcconfig:
+
2022-04-08 Elliott Williams <[email protected]>
[Xcode] Avoid targeting 32-bit iOS and Mac architectures
Modified: branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig (292797 => 292798)
--- branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig 2022-04-13 04:21:58 UTC (rev 292797)
+++ branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig 2022-04-13 04:25:34 UTC (rev 292798)
@@ -23,7 +23,10 @@
PRODUCT_NAME = absl;
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
+
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
-PUBLIC_HEADERS_FOLDER_PATH_not_legacy = /usr/local/include/absl;
+PUBLIC_HEADERS_FOLDER_PATH_not_legacy = $(INSTALL_PATH_PREFIX)/usr/local/include/absl;
PUBLIC_HEADERS_FOLDER_PATH_legacy = /usr/local/include/absl_flattened;
Modified: branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (292797 => 292798)
--- branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-04-13 04:21:58 UTC (rev 292797)
+++ branches/safari-614.1.10-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-04-13 04:25:34 UTC (rev 292798)
@@ -70,7 +70,7 @@
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
-PUBLIC_HEADERS_FOLDER_PATH_not_legacy = ${PUBLIC_HEADERS_FOLDER_PREFIX}/webrtc;
+PUBLIC_HEADERS_FOLDER_PATH_not_legacy = ${INSTALL_PUBLIC_HEADER_PREFIX}/webrtc;
PUBLIC_HEADERS_FOLDER_PATH_legacy = ${PUBLIC_HEADERS_FOLDER_PREFIX}/webrtc_flattened;
USE_HEADERMAP = NO;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
