am b6cb93cf: am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"
# By dvshkurk
# Via Android Git Automerger (1) and others
* commit 'b6cb93cfb62e26168298b6f6e606af379350b064':
Avoid members with the same base name in ar's archives
diff --git a/Source/WebKit/Android.mk b/Source/WebKit/Android.mk
index d440899..0b015cd 100644
--- a/Source/WebKit/Android.mk
+++ b/Source/WebKit/Android.mk
@@ -66,7 +66,7 @@
android/jni/GeolocationServiceBridge.cpp \
android/jni/JavaBridge.cpp \
android/jni/JavaSharedClient.cpp \
- android/jni/MIMETypeRegistry.cpp \
+ android/jni/MIMETypeRegistryAndroid.cpp \
android/jni/MockGeolocation.cpp \
android/jni/PicturePile.cpp \
android/jni/WebCoreFrameBridge.cpp \
@@ -104,7 +104,7 @@
android/plugins/SkANP.cpp \
\
android/wds/Command.cpp \
- android/wds/Connection.cpp \
+ android/wds/ConnectionAndroid.cpp \
android/wds/DebugServer.cpp
LOCAL_C_INCLUDES += \
diff --git a/Source/WebKit/android/jni/MIMETypeRegistry.cpp b/Source/WebKit/android/jni/MIMETypeRegistryAndroid.cpp
similarity index 100%
rename from Source/WebKit/android/jni/MIMETypeRegistry.cpp
rename to Source/WebKit/android/jni/MIMETypeRegistryAndroid.cpp
diff --git a/Source/WebKit/android/wds/Connection.cpp b/Source/WebKit/android/wds/ConnectionAndroid.cpp
similarity index 100%
rename from Source/WebKit/android/wds/Connection.cpp
rename to Source/WebKit/android/wds/ConnectionAndroid.cpp
