diff options
| author | John Reck <jreck@android.com> | 2013-01-30 18:19:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-30 18:19:55 +0000 |
| commit | ae0bf538d04d4d64cec2d753dc633a731cf45daa (patch) | |
| tree | c353e89aa6cf5115fff2fdb79f08f38ff43496c8 | |
| parent | e42858085bbcda11708ca0eefed073294112c049 (diff) | |
| parent | 39cc42902adc24c1b6c8f06e23a7030e062c658f (diff) | |
| download | webkit-ae0bf538d04d4d64cec2d753dc633a731cf45daa.tar.gz | |
Merge "Avoid members with the same base name in ar's archives"jb-mr1-dev-plus-aosp
| -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 07634b61a..6e23421b6 100644 --- a/Source/WebKit/Android.mk +++ b/Source/WebKit/Android.mk @@ -67,7 +67,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 \ @@ -105,7 +105,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 |