diff options
| author | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 16:52:51 +0000 |
|---|---|---|
| committer | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 16:52:51 +0000 |
| commit | 74de2d9cff8bc3803b7b47794b0f02ac364fa0d1 (patch) | |
| tree | f82262e45d69967699dd021d7e4b1b0d6ee5baff | |
| parent | 90fba6c7ff57877ca5047eff24dc1ae08b9819e5 (diff) | |
| download | chromium_src-74de2d9cff8bc3803b7b47794b0f02ac364fa0d1.zip chromium_src-74de2d9cff8bc3803b7b47794b0f02ac364fa0d1.tar.gz chromium_src-74de2d9cff8bc3803b7b47794b0f02ac364fa0d1.tar.bz2 | |
[Android] Fix x86 compilation with multiply defined command_line.cc
Multiple .cc files cannot be defined in a given compilation unit for x86 Android
Android builds. Rename base/android's command_line.{h,cc} to
command_line_android.{h,cc}.
NOTRY=true
Review URL: https://codereview.chromium.org/77473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236257 0039d316-1c4b-4281-b951-d872f2087c98
| -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" |