diff options
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/Android.mk | 8 |
1 files changed, 2 insertions, 6 deletions
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/, \ |