Title: [292758] trunk/Source/ThirdParty/libwebrtc
Revision
292758
Author
msab...@apple.com
Date
2022-04-11 20:34:04 -0700 (Mon, 11 Apr 2022)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (292757 => 292758)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-04-12 03:00:18 UTC (rev 292757)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-04-12 03:34:04 UTC (rev 292758)
@@ -1,3 +1,15 @@
+2022-04-11  Michael Saboff  <msab...@apple.com>
+
+        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  <e...@apple.com>
 
         [Xcode] Avoid targeting 32-bit iOS and Mac architectures

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig (292757 => 292758)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig	2022-04-12 03:00:18 UTC (rev 292757)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig	2022-04-12 03:34:04 UTC (rev 292758)
@@ -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: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (292757 => 292758)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-04-12 03:00:18 UTC (rev 292757)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-04-12 03:34:04 UTC (rev 292758)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to