Merge WebKit at r78450: Initial merge by git.

[android-x86/external-webkit.git] / Source / JavaScriptCore / Android.mk

diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk
index 052af2c..269d298 100644 (file)
--- a/Source/JavaScriptCore/Android.mk
+++ b/Source/JavaScriptCore/Android.mk
@@ -65,12 +65,6 @@ LOCAL_SRC_FILES := \
        parser/Parser.cpp \
        parser/ParserArena.cpp \
        \
-       pcre/pcre_compile.cpp \
-       pcre/pcre_exec.cpp \
-       pcre/pcre_tables.cpp \
-       pcre/pcre_ucp_searchfuncs.cpp \
-       pcre/pcre_xclass.cpp \
-       \
        profiler/Profile.cpp \
        profiler/ProfileGenerator.cpp \
        profiler/ProfileNode.cpp \
@@ -84,6 +78,7 @@ LOCAL_SRC_FILES := \
        runtime/BooleanObject.cpp \
        runtime/BooleanPrototype.cpp \
        runtime/CallData.cpp \
+       runtime/MarkedBlock.cpp \
        runtime/MarkedSpace.cpp \
        runtime/Heap.cpp \
        runtime/CommonIdentifiers.cpp \
@@ -133,6 +128,7 @@ LOCAL_SRC_FILES := \
        runtime/LiteralParser.cpp \
        runtime/Lookup.cpp \
        runtime/MachineStackMarker.cpp \
+       runtime/ConservativeSet.cpp \
        runtime/MarkStack.cpp \
        runtime/MarkStackPosix.cpp \
        runtime/MathObject.cpp \
@@ -168,6 +164,7 @@ LOCAL_SRC_FILES := \
        \
        wtf/Assertions.cpp \
        wtf/ByteArray.cpp \
+       wtf/CryptographicallyRandomNumber.cpp \
        wtf/CurrentTime.cpp \
        wtf/DateMath.cpp \
        wtf/DecimalNumber.cpp \
@@ -175,7 +172,11 @@ LOCAL_SRC_FILES := \
        wtf/HashTable.cpp \
        wtf/MD5.cpp \
        wtf/MainThread.cpp \
+<<<<<<< HEAD
        wtf/OSAllocatorPosix.cpp \
+=======
+       wtf/OSRandomSource.cpp \
+>>>>>>> webkit.org at r78450
        wtf/PageAllocationAligned.cpp\
        wtf/PageBlock.cpp\
        wtf/RandomNumber.cpp \
@@ -237,6 +238,7 @@ $(LEXER_HEADER): $(LOCAL_PATH)/create_hash_table
 $(LEXER_HEADER): $(intermediates)/%.lut.h : $(LOCAL_PATH)/parser/Keywords.table
        $(transform-generated-source)
 
+<<<<<<< HEAD
 CHARTABLES := $(intermediates)/chartables.c
 $(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH)
 $(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@
@@ -251,3 +253,6 @@ $(REGEXP_JIT_TABLES): $(LOCAL_PATH)/create_regex_tables
        $(transform-generated-source)
 
 LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) $(REGEXP_JIT_TABLES)
+=======
+LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER)
+>>>>>>> webkit.org at r78450