diff options
| author | dvshkurk <Dmitry.V.Shkurko@intel.com> | 2012-06-07 18:59:48 +0700 |
|---|---|---|
| committer | Shuo Gao <shuo.gao@intel.com> | 2013-01-29 13:49:39 +0800 |
| commit | 39cc42902adc24c1b6c8f06e23a7030e062c658f (patch) | |
| tree | c353e89aa6cf5115fff2fdb79f08f38ff43496c8 | |
| parent | e42858085bbcda11708ca0eefed073294112c049 (diff) | |
| download | webkit-39cc42902adc24c1b6c8f06e23a7030e062c658f.tar.gz | |
Avoid members with the same base name in ar's archives
Change-Id: I4f45bba09476b9e8fbc5c73761addcec964962d4
Author: Dmitry Shkurko <Dmitry.V.Shkurko@intel.com>
Signed-off-by: Dmitry Shkurko <Dmitry.V.Shkurko@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ:47091
| -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 |