Makefile and webkitmerge tool edits needed to merge with latest webkit.

diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index a80f19b..f31ddd9 100644 (file)
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -181,11 +181,11 @@ LOCAL_SRC_FILES := \
        wtf/Threading.cpp \
        wtf/ThreadingPthreads.cpp \
        \
-       wtf/android/MainThreadAndroid.cpp \
-       \
        wtf/TypeTraits.cpp \
        wtf/dtoa.cpp \
        \
+       wtf/android/MainThreadAndroid.cpp \
+       \
        wtf/unicode/CollatorDefault.cpp \
        wtf/unicode/UTF8.cpp \
        \

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index e8f6dce..749154f 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -635,8 +635,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/Length.cpp \
        platform/LinkHash.cpp \
        platform/Logging.cpp \
-       platform/MockGeolocationService.cpp \
        platform/MIMETypeRegistry.cpp \
+       platform/MockGeolocationService.cpp \
        platform/ScrollView.cpp \
        platform/Scrollbar.cpp \
        platform/ScrollbarThemeComposite.cpp \
@@ -668,8 +668,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/android/TemporaryLinkStubs.cpp \
        platform/android/WidgetAndroid.cpp \
        \
-       platform/text/android/TextBreakIteratorInternalICU.cpp \
-       \
        platform/animation/Animation.cpp \
        platform/animation/AnimationList.cpp \
        \
@@ -802,6 +800,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/text/TextStream.cpp \
        platform/text/UnicodeRange.cpp \
        \
+       platform/text/android/TextBreakIteratorInternalICU.cpp \
+       \
        plugins/MimeType.cpp \
        plugins/MimeTypeArray.cpp \
        plugins/Plugin.cpp \
@@ -965,12 +965,12 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        storage/LocalStorageThread.cpp \
        storage/OriginQuotaManager.cpp \
        storage/OriginUsageRecord.cpp \
-       storage/SessionStorage.cpp \
-       storage/SessionStorageArea.cpp \
        storage/SQLResultSet.cpp \
        storage/SQLResultSetRowList.cpp \
        storage/SQLStatement.cpp \
        storage/SQLTransaction.cpp \
+       storage/SessionStorage.cpp \
+       storage/SessionStorageArea.cpp \
        storage/Storage.cpp \
        storage/StorageArea.cpp \
        storage/StorageEvent.cpp \

diff --git a/WebKitTools/android/webkitmerge/webkitmerge.cpp b/WebKitTools/android/webkitmerge/webkitmerge.cpp
index 768da82..637a1ed 100644 (file)
--- a/WebKitTools/android/webkitmerge/webkitmerge.cpp
+++ b/WebKitTools/android/webkitmerge/webkitmerge.cpp
@@ -640,34 +640,35 @@ char* GetMakeAndExceptions(const char* dir, const char* filename, size_t* makeSi
             break;
         start += strlen(start) + 1;
     } while (start < makeFile + *makeSize);
-    myassert(start[0] != '\0');
-    string excludedDirs = "-e '/\\.vcproj\\// d' -e '/\\.svn\\// d' ";
-    do {
-        start += strlen(start) + 1;
-        char* exceptionDirStart = start;
-        if (strncmp(exceptionDirStart, "#\t", 2) != 0) {
-            myassert(exceptionDirStart[0] == '\0');
-            break;
-        }
-        exceptionDirStart += 2;
-        char* exceptionDirEnd = exceptionDirStart;
-        do
-            exceptionDirEnd = strchr(exceptionDirEnd, '\\'); 
-        while (exceptionDirEnd && *++exceptionDirEnd == '/');
-        myassert(exceptionDirEnd);
-        --exceptionDirEnd;
-        myassert(exceptionDirEnd[-1] == ' ');
-        myassert(exceptionDirEnd[-2] == '*');
-        myassert(exceptionDirEnd[-3] == '/');
-        exceptionDirEnd[-3] = '\0';
-        excludedDirs += "-e '/";
-        if (exceptionDirStart[0] == '/')
-            excludedDirs += "\\";
-        excludedDirs += exceptionDirStart;
-        excludedDirs += "\\// d' ";
-        start = exceptionDirEnd;
-    } while (true);
-    *excludedDirsPtr = excludedDirs;
+    if (start[0] != '\0') {
+        string excludedDirs = "-e '/\\.vcproj\\// d' -e '/\\.svn\\// d' ";
+        do {
+            start += strlen(start) + 1;
+            char* exceptionDirStart = start;
+            if (strncmp(exceptionDirStart, "#\t", 2) != 0) {
+                myassert(exceptionDirStart[0] == '\0');
+                break;
+            }
+            exceptionDirStart += 2;
+            char* exceptionDirEnd = exceptionDirStart;
+            do {
+                exceptionDirEnd = strchr(exceptionDirEnd, '\\');
+            } while (exceptionDirEnd && *++exceptionDirEnd == '/');
+            myassert(exceptionDirEnd);
+            --exceptionDirEnd;
+            myassert(exceptionDirEnd[-1] == ' ');
+            myassert(exceptionDirEnd[-2] == '*');
+            myassert(exceptionDirEnd[-3] == '/');
+            exceptionDirEnd[-3] = '\0';
+            excludedDirs += "-e '/";
+            if (exceptionDirStart[0] == '/')
+                excludedDirs += "\\";
+            excludedDirs += exceptionDirStart;
+            excludedDirs += "\\// d' ";
+            start = exceptionDirEnd;
+        } while (true);
+        *excludedDirsPtr = excludedDirs;
+    }
     *startPtr = start;
     // optionally look for android-specific files
     char* makeEnd = makeFile + *makeSize;