From 0fa866435a202d26c06a48475da734e9e98c2879 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 9 May 2011 19:57:19 +0100 Subject: Merge WebKit at r75315: Fix Makefiles See http://trac.webkit.org/changeset/74646 Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01 --- Source/JavaScriptCore/Android.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore') diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk index d72b686..579451b 100644 --- a/Source/JavaScriptCore/Android.mk +++ b/Source/JavaScriptCore/Android.mk @@ -200,17 +200,13 @@ LOCAL_SRC_FILES := \ \ wtf/unicode/icu/CollatorICU.cpp \ \ -<<<<<<< HEAD:JavaScriptCore/Android.mk wtf/url/src/URLCharacterTypes.cpp \ wtf/url/src/URLEscape.cpp \ wtf/url/src/URLSegments.cpp \ \ - yarr/RegexCompiler.cpp \ -======= - yarr/RegexPattern.cpp \ ->>>>>>> webkit.org at r75315:Source/JavaScriptCore/Android.mk yarr/RegexInterpreter.cpp \ - yarr/RegexJIT.cpp + yarr/RegexJIT.cpp \ + yarr/RegexPattern.cpp # generated headers JSC_OBJECTS := $(addprefix $(intermediates)/runtime/, \ -- cgit v1.1