diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 09:48:39 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 09:48:39 +0000 |
| commit | 5e44a14c0ab8d14036de5632bfefa53fd251babe (patch) | |
| tree | 0bcd0b402d788530159528c23d50c1aa66d6d76e /content/browser/android | |
| parent | ce7b692706a5e2e199117c647a93423bd0117417 (diff) | |
| download | chromium_src-5e44a14c0ab8d14036de5632bfefa53fd251babe.zip chromium_src-5e44a14c0ab8d14036de5632bfefa53fd251babe.tar.gz chromium_src-5e44a14c0ab8d14036de5632bfefa53fd251babe.tar.bz2 | |
Fix x86 build of Android.
After https://chromiumcodereview.appspot.com/12321131/ there are two copies of child_process_launcher.cc
content/browser/android and in content/browser. Rename the former to avoid having duplicate basenames
which is a problem for some toolchains. This wasn't seen in chromium as there isn't coverage for x86.
BUG=178382
TBR=joth,jam
Review URL: https://chromiumcodereview.appspot.com/12575010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
| -rw-r--r-- | content/browser/android/browser_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | content/browser/android/child_process_launcher_android.cc (renamed from content/browser/android/child_process_launcher.cc) | 2 | ||||
| -rw-r--r-- | content/browser/android/child_process_launcher_android.h (renamed from content/browser/android/child_process_launcher.h) | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc index d15391b..1915337 100644 --- a/content/browser/android/browser_jni_registrar.cc +++ b/content/browser/android/browser_jni_registrar.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "content/browser/android/android_browser_process.h" -#include "content/browser/android/child_process_launcher.h" +#include "content/browser/android/child_process_launcher_android.h" #include "content/browser/android/content_settings.h" #include "content/browser/android/content_video_view.h" #include "content/browser/android/content_view_core_impl.h" diff --git a/content/browser/android/child_process_launcher.cc b/content/browser/android/child_process_launcher_android.cc index 32feae6..3a954dc 100644 --- a/content/browser/android/child_process_launcher.cc +++ b/content/browser/android/child_process_launcher_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 "content/browser/android/child_process_launcher.h" +#include "content/browser/android/child_process_launcher_android.h" #include "base/android/jni_android.h" #include "base/android/jni_array.h" diff --git a/content/browser/android/child_process_launcher.h b/content/browser/android/child_process_launcher_android.h index 4b152c6..e83e04e 100644 --- a/content/browser/android/child_process_launcher.h +++ b/content/browser/android/child_process_launcher_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 CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_H_ -#define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_H_ +#ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ +#define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ #include <jni.h> @@ -33,5 +33,4 @@ bool RegisterChildProcessLauncher(JNIEnv* env); } // namespace content -#endif // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_H_ - +#endif // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ |