Changeset 212042 in webkit


Ignore:
Timestamp:
Feb 9, 2017 9:08:59 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Unreviewed, rolling out r212040.

Broke build. I'm not surprised

Reverted changeset:

"[WebRTC][Mac] Activate libwebrtc"
​https://bugs.webkit.org/show_bug.cgi?id=167293
​http://trac.webkit.org/changeset/212040

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r212040 r212042  
     12017-02-09  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212040.
     4
     5        Broke build.  I'm not surprised
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212040
     12
    1132017-02-09  Youenn Fablet  <youenn@apple.com>
    214

  • trunk/Source/WTF/wtf/Platform.h

    r212040 r212042  
    12231223#endif /* PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 */
    12241224
    1225 #if PLATFORM(COCOA)
    1226 #define USE_LIBWEBRTC 1
    1227 #endif
    1228 
    12291225#endif /* WTF_Platform_h */

  • trunk/Source/WebCore/ChangeLog

    r212041 r212042  
     12017-02-09  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212040.
     4
     5        Broke build.  I'm not surprised
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212040
     12
    1132017-02-09  Chris Dumez  <cdumez@apple.com>
    214

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r212040 r212042  
    6868
    6969OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM)
    70 OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE -lboringssl -lopus -lsrtp -lusrsctp -lwebrtcpcrtc -lyuv -lwebrtc -framework VideoToolbox -framework CoreMedia;
    71 OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework MobileCoreServices -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS) -framework CoreVideo -framework AVFoundation -framework UIKit;
     70OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
     71OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework MobileCoreServices -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS);
    7272OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface -framework GraphicsServices;
    7373OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);

  • trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig

    r212040 r212042  
    4949EXPORTED_SYMBOLS_FILE = ;
    5050GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    51 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) -lboringssl -lwebrtc;
    52 OTHER_LDFLAGS[sdk=macos*] = $(inherited) -framework AppKit;
    53 OTHER_LDFLAGS[sdk=iphoneos*] = $(inherited) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
    54 OTHER_LDFLAGS[sdk=iphonesimulator*] = $(inherited) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
     51OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
     52OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit;
     53OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
     54OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
    5555SECT_ORDER_FLAGS = ;

  • trunk/Source/WebKit2/ChangeLog

    r212041 r212042  
     12017-02-09  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212040.
     4
     5        Broke build.  I'm not surprised
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212040
     12
    1132017-02-09  Chris Dumez  <cdumez@apple.com>
    214

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r212040 r212042  
    4545UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
    4646
    47 OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) -framework WebKitLegacy -sub_umbrella WebKitLegacy -lboringssl -lwebrtc;
     47OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) -framework WebKitLegacy -sub_umbrella WebKitLegacy;
    4848OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -sub_umbrella WebCore;
    4949OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = -lAccessibility;

  • trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h

    r212040 r212042  
    213213    macro(SubpixelCSSOMElementMetricsEnabled, subpixelCSSOMElementMetricsEnabled, Bool, bool, false, "", "") \
    214214    macro(UseGiantTiles, useGiantTiles, Bool, bool, false, "", "") \
    215     macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, true, "", "") \
     215    macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, false, "", "") \
    216216    macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false, "", "") \
    217217    macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false, "", "") \
    … …  
    318318    macro(ModernMediaControlsEnabled, modernMediaControlsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Modern Media Controls", "Use modern media controls look") \
    319319    macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Input Events", "Enable InputEvents support") \
    320     macro(PeerConnectionEnabled, peerConnectionEnabled, Bool, bool, true, "WebRTC", "Enable WebRTC API") \
     320    macro(PeerConnectionEnabled, peerConnectionEnabled, Bool, bool, false, "WebRTC", "Enable WebRTC API") \
    321321    macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubtleCrypto", "Enable SubtleCrypto support") \
    322322    macro(UserTimingEnabled, userTimingEnabled, Bool, bool, false, "User Timing", "Enable UserTiming API") \

  • trunk/Tools/ChangeLog

    r212034 r212042  
     12017-02-09  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212040.
     4
     5        Broke build.  I'm not surprised
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212040
     12
    1132017-02-09  Alex Christensen  <achristensen@webkit.org>
    214
Note: See TracChangeset for help on using the changeset viewer.