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 /content/app/android/library_loader_hooks.cc | |
| 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
Diffstat (limited to 'content/app/android/library_loader_hooks.cc')
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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" |