Changeset 213468 in webkit

Timestamp:

Mar 6, 2017, 2:46:57 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Fix Production libwebrtc build after r213418
​https://bugs.webkit.org/show_bug.cgi?id=169217
<rdar://problem/30876775>

Reviewed by Tim Horton.

• Source/webrtc/base/checks.h:
• libwebrtc.xcodeproj/project.pbxproj:

MakeCheckOpString was a weak export, and it wasn't needed.
There is an internal build that checks for weak exports and fails if there is one.
Run the check-for-weak-vtables-and-externals script for libwebrtc.dylib like we do for the other frameworks.

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Source/webrtc/base/checks.h (modified) (2 diffs)
• libwebrtc.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2017-03-06  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Production libwebrtc build after r213418
+        https://bugs.webkit.org/show_bug.cgi?id=169217
+        <rdar://problem/30876775>
+
+        Reviewed by Tim Horton.
+
+        * Source/webrtc/base/checks.h:
+        * libwebrtc.xcodeproj/project.pbxproj:
+        MakeCheckOpString was a weak export, and it wasn't needed.
+        There is an internal build that checks for weak exports and fails if there is one.
+        Run the check-for-weak-vtables-and-externals script for libwebrtc.dylib like we do for the other frameworks.
+
 2017-03-04  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h

@@ -137 +137 @@
 
 // MSVC doesn't like complex extern templates and DLLs.
-#if !defined(COMPILER_MSVC)
+#if 0
 // Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated
 // in logging.cc.
@@ -143 +143 @@
     const int&, const int&, const char* names);
 extern template
-WEBRTC_DYLIB_EXPORT std::string* MakeCheckOpString<unsigned long, unsigned long>(
+std::string* MakeCheckOpString<unsigned long, unsigned long>(
     const unsigned long&, const unsigned long&, const char* names);
 extern template

trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

@@ -10592 +10592 @@
                                 FB39D0CE1200F0E300088E69 /* Sources */,
                                 FB39D0CF1200F0E300088E69 /* Frameworks */,
+                                5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */,
                                 312BDB0B15FECAB00097EBC7 /* CopyFiles */,
                                 312BDB0D15FECACE0097EBC7 /* CopyFiles */,
@@ -10665 +10666 @@
                         shellPath = /bin/sh;
                         shellScript = "PRIVATE_HEADERS_FOLDER_PATH=usr/local/include\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n    PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n    PRIVATE_HEADERS_PATH=\"${DSTROOT}${INSTALL_PATH_PREFIX%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/webrtc\" \"${PRIVATE_HEADERS_PATH}\"\n";
+                };
+                5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = {
+                        isa = PBXShellScriptBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                        );
+                        inputPaths = (
+                                "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
+                        );
+                        name = "Check for Weak VTables and Externals";
+                        outputPaths = (
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                        shellPath = /bin/sh;
+                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n    ../../../Tools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi";
                 };
 /* End PBXShellScriptBuildPhase section */