diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 17:56:04 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 17:56:04 +0000 |
| commit | 61be42da3bb094cb9b5ebff6bf8d61c55479b0bf (patch) | |
| tree | a14bf66208b5dddd4f13e78691a2208d784ff1ae /base | |
| parent | 174759d88a2bbe08803a7c049af33029f65fbcdd (diff) | |
| download | chromium_src-61be42da3bb094cb9b5ebff6bf8d61c55479b0bf.zip chromium_src-61be42da3bb094cb9b5ebff6bf8d61c55479b0bf.tar.gz chromium_src-61be42da3bb094cb9b5ebff6bf8d61c55479b0bf.tar.bz2 | |
Move base/android/path_service.cc|h to path_service_android.cc|h
Gyp targets shouldn't contain source with identical basenames.
Fallout from http://src.chromium.org/viewvc/chrome?view=rev&revision=149842
Review URL: https://chromiumcodereview.appspot.com/10828152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/android/base_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | base/android/path_service_android.cc (renamed from base/android/path_service.cc) | 2 | ||||
| -rw-r--r-- | base/android/path_service_android.h (renamed from base/android/path_service.h) | 6 | ||||
| -rw-r--r-- | base/base.gypi | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc index 6f4096a..df490db 100644 --- a/base/android/base_jni_registrar.cc +++ b/base/android/base_jni_registrar.cc @@ -10,7 +10,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "base/android/locale_utils.h" -#include "base/android/path_service.h" +#include "base/android/path_service_android.h" #include "base/android/path_utils.h" namespace base { diff --git a/base/android/path_service.cc b/base/android/path_service_android.cc index 8591e90..a9bf92d 100644 --- a/base/android/path_service.cc +++ b/base/android/path_service_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/android/path_service.h" +#include "base/android/path_service_android.h" #include "base/file_path.h" #include "base/path_service.h" diff --git a/base/android/path_service.h b/base/android/path_service_android.h index baaa2a4..26040f9 100644 --- a/base/android/path_service.h +++ b/base/android/path_service_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_ANDROID_PATH_SERVICE_H_ -#define BASE_ANDROID_PATH_SERVICE_H_ +#ifndef BASE_ANDROID_PATH_SERVICE_ANDROID_H_ +#define BASE_ANDROID_PATH_SERVICE_ANDROID_H_ #include <jni.h> @@ -15,4 +15,4 @@ bool RegisterPathService(JNIEnv* env); } // namespace android } // namespace base -#endif // BASE_ANDROID_PATH_SERVICE_H_ +#endif // BASE_ANDROID_PATH_SERVICE_ANDROID_H_ diff --git a/base/base.gypi b/base/base.gypi index 4fce959..dd78c41 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -41,8 +41,8 @@ 'android/jni_string.h', 'android/locale_utils.cc', 'android/locale_utils.h', - 'android/path_service.cc', - 'android/path_service.h', + 'android/path_service_android.cc', + 'android/path_service_android.h', 'android/path_utils.cc', 'android/path_utils.h', 'at_exit.cc', |