resolved conflicts for merge of a08c8a5f to master

Change-Id: I8efc2ef2e8e51d823b7ec8c26bd90ce934f60900

diff --cc Android.mk
index 5f56c47,b383867..6df03ae
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -157,10 -69,9 +69,10 @@@ include $(BASE_PATH)/bison_check.m
  #
  # Note that JavasCriptCore/ must be included after WebCore/, so that we pick up
  # the right config.h.
- LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ LOCAL_C_INCLUDES := \
        $(JNI_H_INCLUDE) \
        $(LOCAL_PATH)/WebKit/android/icu \
 +      bionic/ \
        external/ \
        external/icu4c/common \
        external/icu4c/i18n \
@@@ -244,6 -156,93 +156,94 @@@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES
        $(base_intermediates)/WebCore/svg
  endif
  
+ ifeq ($(JAVASCRIPT_ENGINE),v8)
+ # Include WTF source file.
+ d := JavaScriptCore
+ LOCAL_PATH := $(BASE_PATH)/$d
+ intermediates := $(base_intermediates)/$d
+ include $(LOCAL_PATH)/Android.v8.wtf.mk
+ WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
+ endif  # JAVASCRIPT_ENGINE == v8
+ 
+ # Include source files for WebCore
+ d := WebCore
+ LOCAL_PATH := $(BASE_PATH)/$d
+ JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
+ intermediates := $(base_intermediates)/$d
+ include $(LOCAL_PATH)/Android.mk
+ ifeq ($(JAVASCRIPT_ENGINE),jsc)
+ include $(LOCAL_PATH)/Android.jscbindings.mk
+ endif
+ ifeq ($(JAVASCRIPT_ENGINE),v8)
+ include $(LOCAL_PATH)/Android.v8bindings.mk
+ # TODO: We should use the WebCore JNI code instead.
+ JNI_PATH := V8Binding/jni
+ # bridge/jni path must be listed after V8Bindings, so files are preferentially
+ # included from V8bindings.
+ BINDING_C_INCLUDES += \
+       $(BASE_PATH)/$(JNI_PATH) \
+       $(LOCAL_PATH)/bridge/jni \
+       $(LOCAL_PATH)/bridge/jni/v8
+ JNI_SRC_FILES := \
+       jni_class.cpp \
+       jni_instance.cpp \
+       jni_npobject.cpp \
+       jni_runtime.cpp
+ WEBKIT_SRC_FILES += $(addprefix $(JNI_PATH)/,$(JNI_SRC_FILES))
+ endif
+ WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
+ LOCAL_C_INCLUDES += $(BINDING_C_INCLUDES)
+ 
+ # Include the derived source files for WebCore. Uses the same path as
+ # WebCore
+ include $(LOCAL_PATH)/Android.derived.mk
+ ifeq ($(JAVASCRIPT_ENGINE),jsc)
+ include $(LOCAL_PATH)/Android.derived.jscbindings.mk
+ endif
+ ifeq ($(JAVASCRIPT_ENGINE),v8)
+ include $(LOCAL_PATH)/Android.derived.v8bindings.mk
+ endif
+ 
+ # Include source files for android WebKit port
+ d := WebKit
+ LOCAL_PATH := $(BASE_PATH)/$d
+ intermediates := $(base_intermediates)/$d
+ include $(LOCAL_PATH)/Android.mk
+ WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
+ 
+ # Redefine LOCAL_PATH here so the build system is not confused
+ LOCAL_PATH := $(BASE_PATH)
+ 
+ # Define our compiler flags
+ LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format
+ LOCAL_CFLAGS += -fno-strict-aliasing
+ LOCAL_CFLAGS += -include "WebCorePrefix.h"
+ LOCAL_CFLAGS += -fvisibility=hidden
++LOCAL_CFLAGS += -D__SGI_STL_INTERNAL_PAIR_H
+ 
+ ifeq ($(TARGET_ARCH),arm)
+ LOCAL_CFLAGS += -Darm
+ # remove this warning: "note: the mangling of 'va_list' has changed in GCC 4.4"
+ LOCAL_CFLAGS += -Wno-psabi
+ endif
+ 
+ ifeq ($(ENABLE_SVG),true)
+ LOCAL_CFLAGS += -DENABLE_SVG=1
+ endif
+ 
+ # Temporary disable SVG_ANIMATION.
+ ifeq ($(ENABLE_SVG_ANIMATION),true)
+ LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1
+ endif
+ 
+ ifeq ($(WEBCORE_INSTRUMENTATION),true)
+ LOCAL_CFLAGS += -DANDROID_INSTRUMENT
+ endif
+ 
+ # LOCAL_LDLIBS is used in simulator builds only and simulator builds are only
+ # valid on Linux
+ LOCAL_LDLIBS += -lpthread -ldl
+ 
  # Build the list of shared libraries
  LOCAL_SHARED_LIBRARIES := \
        libandroid_runtime \