Title: [264709] branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc
- Revision
- 264709
- Author
- alanc...@apple.com
- Date
- 2020-07-22 11:00:35 -0700 (Wed, 22 Jul 2020)
Log Message
Cherry-pick r264693. rdar://problem/65944676
Unreviewed build fix after r264685; copy headers to the correct path during a DEPLOYMENT_LOCATION build.
* Configurations/libwebm.xcconfig:
* libwebrtc.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264693 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/ChangeLog (264708 => 264709)
--- branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/ChangeLog 2020-07-22 18:00:32 UTC (rev 264708)
+++ branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/ChangeLog 2020-07-22 18:00:35 UTC (rev 264709)
@@ -1,5 +1,23 @@
2020-07-22 Alan Coon <alanc...@apple.com>
+ Cherry-pick r264693. rdar://problem/65944676
+
+ Unreviewed build fix after r264685; copy headers to the correct path during a DEPLOYMENT_LOCATION build.
+
+ * Configurations/libwebm.xcconfig:
+ * libwebrtc.xcodeproj/project.pbxproj:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264693 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-07-21 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix after r264685; copy headers to the correct path during a DEPLOYMENT_LOCATION build.
+
+ * Configurations/libwebm.xcconfig:
+ * libwebrtc.xcodeproj/project.pbxproj:
+
+2020-07-22 Alan Coon <alanc...@apple.com>
+
Cherry-pick r264685. rdar://problem/65944676
[Cocoa] Add experimental MSE WebM parser
Modified: branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig (264708 => 264709)
--- branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig 2020-07-22 18:00:32 UTC (rev 264708)
+++ branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig 2020-07-22 18:00:35 UTC (rev 264709)
@@ -8,6 +8,9 @@
HEADER_SEARCH_PATHS = Source/third_party/libwebm Source/third_party/libwebm/webm_parser Source/third_party/libwebm/webm_parser/include;
INSTALL_PATH = /usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include;
USE_HEADERMAP = NO;
+INSTALL_HEADERS_PATH = /usr/local/include;
+LIBWEBM_HEADERS_FOLDER_PATH = $(LIBWEBM_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
+LIBWEBM_HEADERS_FOLDER_PATH_NO = $(BUILT_PRODUCTS_DIR)/$(INSTALL_HEADERS_PATH);
+LIBWEBM_HEADERS_FOLDER_PATH_YES = $(INSTALL_HEADERS_PATH);
Modified: branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (264708 => 264709)
--- branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2020-07-22 18:00:32 UTC (rev 264708)
+++ branches/safari-610.1.23-branch/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2020-07-22 18:00:35 UTC (rev 264709)
@@ -4185,8 +4185,8 @@
CDFD2FC424C4D9D10048DAC3 /* Copy webm headers */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = usr/local/include/webm;
- dstSubfolderSpec = 16;
+ dstPath = "$(LIBWEBM_HEADERS_FOLDER_PATH)/webm";
+ dstSubfolderSpec = 0;
files = (
CDFD2FC524C4DAF70048DAC3 /* buffer_reader.h in Copy webm headers */,
CDFD2FC624C4DAF70048DAC3 /* callback.h in Copy webm headers */,
@@ -4205,8 +4205,8 @@
CDFD2FCF24C4DB0C0048DAC3 /* Copy common headers */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = usr/local/include/common;
- dstSubfolderSpec = 16;
+ dstPath = "$(LIBWEBM_HEADERS_FOLDER_PATH)/common";
+ dstSubfolderSpec = 0;
files = (
CDFD2FD024C4DB2F0048DAC3 /* vp9_header_parser.h in Copy common headers */,
);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
