diff options
| author | John Reck <jreck@android.com> | 2013-01-30 12:09:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-30 12:09:58 -0800 |
| commit | 94bcd9e3661813605b05f5f19601bb6b665476bb (patch) | |
| tree | 80a8b36989da171e4cc22384abfdbc44c255f1eb | |
| parent | 308dfd2dfccc78a73ababf1f256b20e9cd35875e (diff) | |
| parent | 97df262f2fd351a399bc757d3f7e7c7bb3b00065 (diff) | |
| download | webkit-94bcd9e3661813605b05f5f19601bb6b665476bb.tar.gz | |
am 97df262f: am b6cb93cf: am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"
# By dvshkurk
# Via Android Git Automerger (2) and others
* commit '97df262f2fd351a399bc757d3f7e7c7bb3b00065':
Avoid members with the same base name in ar's archives
| -rw-r--r-- | Source/WebKit/Android.mk | 4 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/MIMETypeRegistryAndroid.cpp (renamed from Source/WebKit/android/jni/MIMETypeRegistry.cpp) | 0 | ||||
| -rw-r--r-- | Source/WebKit/android/wds/ConnectionAndroid.cpp (renamed from Source/WebKit/android/wds/Connection.cpp) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/Android.mk b/Source/WebKit/Android.mk index d4408996c..0b015cd0e 100644 --- a/Source/WebKit/Android.mk +++ b/Source/WebKit/Android.mk @@ -66,7 +66,7 @@ LOCAL_SRC_FILES += \ 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 @@ LOCAL_SRC_FILES += \ 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 index 2734aeb2a..2734aeb2a 100644 --- a/Source/WebKit/android/jni/MIMETypeRegistry.cpp +++ b/Source/WebKit/android/jni/MIMETypeRegistryAndroid.cpp diff --git a/Source/WebKit/android/wds/Connection.cpp b/Source/WebKit/android/wds/ConnectionAndroid.cpp index 52193e546..52193e546 100644 --- a/Source/WebKit/android/wds/Connection.cpp +++ b/Source/WebKit/android/wds/ConnectionAndroid.cpp |