Changeset 88741 in webkit


Ignore:
Timestamp:
Jun 13, 2011 5:53:47 PM (13 years ago)
Author:
steveblock@google.com
Message:

2011-06-13 Steve Block <​steveblock@google.com>

Reviewed by Darin Adler.

Remove Android defines from WebCore/config.h
​https://bugs.webkit.org/show_bug.cgi?id=62602

No new tests, build cleanup only.

  • config.h:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r88740 r88741  
     12011-06-13  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Remove Android defines from WebCore/config.h
     6        https://bugs.webkit.org/show_bug.cgi?id=62602
     7
     8        No new tests, build cleanup only.
     9
     10        * config.h:
     11
    1122011-06-13  Adam Barth  <abarth@webkit.org>
    213

  • trunk/Source/WebCore/config.h

    r85036 r88741  
    109109
    110110#endif /* OS(WINDOWS) */
    111 
    112 #if PLATFORM(ANDROID)
    113 // Android uses a single set of include directories when building WebKit and
    114 // JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android
    115 // includes JavaScriptCore/config.h explicitly here to make sure it gets picked
    116 // up.
    117 #include <JavaScriptCore/config.h>
    118 
    119 #define WEBCORE_NAVIGATOR_VENDOR "Google Inc."
    120 // This must be defined before we include FastMalloc.h, below.
    121 #define USE_SYSTEM_MALLOC 1
    122 #define LOG_DISABLED 1
    123 #include <wtf/Assertions.h>
    124 // Central place to set which optional features Android uses.
    125 #define ENABLE_CHANNEL_MESSAGING 1
    126 #define ENABLE_DOM_STORAGE 1
    127 #undef ENABLE_FTPDIR  // Enabled by default in Platform.h
    128 #define ENABLE_FTPDIR 0
    129 #ifndef ENABLE_SVG
    130 #define ENABLE_SVG 0
    131 #endif
    132 #define ENABLE_VIDEO 1
    133 #define ENABLE_WORKERS 1
    134 #define ENABLE_XBL 0
    135 #define ENABLE_XHTMLMP 0
    136 #define ENABLE_XPATH 0
    137 #define ENABLE_XSLT 0
    138 #define ENABLE_ARCHIVE 0
    139 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1
    140 #undef ENABLE_GEOLOCATION  // Disabled by default in Platform.h
    141 #define ENABLE_GEOLOCATION 1
    142 #undef ENABLE_INSPECTOR  // Enabled by default in Platform.h
    143 #define ENABLE_INSPECTOR 0
    144 #define ENABLE_EVENT_SOURCE 0
    145 #endif /* PLATFORM(ANDROID) */
    146111
    147112#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.