diff options
| -rw-r--r-- | base/android/base_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | base/android/command_line_android.cc (renamed from base/android/command_line.cc) | 2 | ||||
| -rw-r--r-- | base/android/command_line_android.h (renamed from base/android/command_line.h) | 6 | ||||
| -rw-r--r-- | base/base.gypi | 4 | ||||
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc index d4a6ee3..9fd1dab 100644 --- a/base/android/base_jni_registrar.cc +++ b/base/android/base_jni_registrar.cc @@ -6,7 +6,7 @@ #include "base/android/activity_status.h" #include "base/android/build_info.h" -#include "base/android/command_line.h" +#include "base/android/command_line_android.h" #include "base/android/content_uri_utils.h" #include "base/android/cpu_features.h" #include "base/android/important_file_writer_android.h" diff --git a/base/android/command_line.cc b/base/android/command_line_android.cc index 69ab921..895ffab 100644 --- a/base/android/command_line.cc +++ b/base/android/command_line_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/command_line.h" +#include "base/android/command_line_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" diff --git a/base/android/command_line.h b/base/android/command_line_android.h index a15966a..cf117e2 100644 --- a/base/android/command_line.h +++ b/base/android/command_line_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_COMMAND_LINE_H_ -#define BASE_ANDROID_COMMAND_LINE_H_ +#ifndef BASE_ANDROID_COMMAND_LINE_ANDROID_H_ +#define BASE_ANDROID_COMMAND_LINE_ANDROID_H_ #include <jni.h> @@ -23,4 +23,4 @@ bool RegisterCommandLine(JNIEnv* env); } // namespace android } // namespace base -#endif // BASE_ANDROID_COMMAND_LINE_H_ +#endif // BASE_ANDROID_COMMAND_LINE_ANDROID_H_ diff --git a/base/base.gypi b/base/base.gypi index dc83d21..6807a38 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -39,8 +39,8 @@ 'android/base_jni_registrar.h', 'android/build_info.cc', 'android/build_info.h', - 'android/command_line.cc', - 'android/command_line.h', + 'android/command_line_android.cc', + 'android/command_line_android.h', 'android/content_uri_utils.cc', 'android/content_uri_utils.h', 'android/cpu_features.cc', diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 90a27c0..7ae89e6 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -5,7 +5,7 @@ #include "content/public/app/android_library_loader_hooks.h" #include "base/android/base_jni_registrar.h" -#include "base/android/command_line.h" +#include "base/android/command_line_android.h" #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "base/android/jni_string.h" |