From 5e44a14c0ab8d14036de5632bfefa53fd251babe Mon Sep 17 00:00:00 2001 From: "yfriedman@chromium.org" Date: Tue, 19 Mar 2013 09:48:39 +0000 Subject: 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 --- content/browser/child_process_launcher.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'content/browser/child_process_launcher.cc') diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 20df18e..991223d 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -29,7 +29,7 @@ #include "content/browser/mach_broker_mac.h" #elif defined(OS_ANDROID) #include "base/android/jni_android.h" -#include "content/browser/android/child_process_launcher.h" +#include "content/browser/android/child_process_launcher_android.h" #elif defined(OS_POSIX) #include "base/memory/singleton.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" -- cgit v1.1