| commit | ae0bf538d04d4d64cec2d753dc633a731cf45daa | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@android.com> | Wed Jan 30 18:19:54 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 30 18:19:55 2013 +0000 |
| tree | c353e89aa6cf5115fff2fdb79f08f38ff43496c8 | |
| parent | e42858085bbcda11708ca0eefed073294112c049 [diff] | |
| parent | 39cc42902adc24c1b6c8f06e23a7030e062c658f [diff] |
Merge "Avoid members with the same base name in ar's archives"
diff --git a/Source/WebKit/Android.mk b/Source/WebKit/Android.mk index 07634b6..6e23421 100644 --- a/Source/WebKit/Android.mk +++ b/Source/WebKit/Android.mk
@@ -67,7 +67,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 \ @@ -105,7 +105,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