diff options
| -rw-r--r-- | WebCore/Android.derived.mk | 9 | ||||
| -rw-r--r-- | WebCore/WebCorePrefix.h | 5 | ||||
| -rw-r--r-- | WebCore/config.h | 6 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/V8Counters.cpp | 5 |
4 files changed, 12 insertions, 13 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index e2cf096..7c2e8e4 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -59,12 +59,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) GEN := $(intermediates)/html/DocTypeStrings.cpp $(GEN): SCRIPT := $(LOCAL_PATH)/make-hash-tools.pl -$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) . $< +$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) $(dir $@) $< $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf $(transform-generated-source) - @mv ./DocTypeStrings.cpp $@ -# we have to do this dep by hand: -$(intermediates)/html/HTMLDocument.o : $(GEN) +LOCAL_GENERATED_SOURCES += $(GEN) # HTML entity table @@ -86,10 +84,9 @@ LOCAL_GENERATED_SOURCES += $(GEN) GEN := $(intermediates)/platform/ColorData.cpp $(GEN): SCRIPT := $(LOCAL_PATH)/make-hash-tools.pl -$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) . $< +$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) $(dir $@) $< $(GEN): $(LOCAL_PATH)/platform/ColorData.gperf $(transform-generated-source) - @mv ./ColorData.cpp $@ LOCAL_GENERATED_SOURCES += $(GEN) diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h index cde5a85..a871e4c 100644 --- a/WebCore/WebCorePrefix.h +++ b/WebCore/WebCorePrefix.h @@ -70,11 +70,6 @@ #define PREFIX_FOR_WEBCORE 1 #define EXPORT __attribute__((visibility("default"))) #endif -// Android uses a single set of include directories when building WebKit and -// JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android -// includes JavaScriptCore/config.h explicitly here to make sure it gets picked -// up. -#include <JavaScriptCore/config.h> #endif #if !defined(BUILDING_BREWMP__) diff --git a/WebCore/config.h b/WebCore/config.h index f88ad3b..b259f9e 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -81,6 +81,12 @@ // ANDROID def should be after all PLATFORM to avoid override. #if PLATFORM(ANDROID) +// Android uses a single set of include directories when building WebKit and +// JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android +// includes JavaScriptCore/config.h explicitly here to make sure it gets picked +// up. +#include <JavaScriptCore/config.h> + #define WEBCORE_NAVIGATOR_VENDOR "Google Inc." // This must be defined before we include FastMalloc.h, below. #define USE_SYSTEM_MALLOC 1 diff --git a/WebKit/android/WebCoreSupport/V8Counters.cpp b/WebKit/android/WebCoreSupport/V8Counters.cpp index 4e7351d..d164f9a 100644 --- a/WebKit/android/WebCoreSupport/V8Counters.cpp +++ b/WebKit/android/WebCoreSupport/V8Counters.cpp @@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if USE(V8) #ifdef ANDROID_INSTRUMENT @@ -31,12 +30,14 @@ #include "config.h" #include "V8Counters.h" -#include "NotImplemented.h" +#include "NotImplemented.h" #include <utils/Log.h> #include <wtf/text/CString.h> #include <wtf/text/StringHash.h> +#if USE(V8) + namespace WebCore { V8Counters::Counter::Counter(bool isHistogram) |