diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 06:05:54 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 06:05:54 +0000 |
| commit | 2d30dc03dc0bd0723236c549313774119f163056 (patch) | |
| tree | 370909deacfadfffa168d22321b1cb1ef7608e42 /chrome/app/chrome_main_delegate.h | |
| parent | 1eeb971326a2a38b782443ae1857f37f5d74eb07 (diff) | |
| download | chromium_src-2d30dc03dc0bd0723236c549313774119f163056.zip chromium_src-2d30dc03dc0bd0723236c549313774119f163056.tar.gz chromium_src-2d30dc03dc0bd0723236c549313774119f163056.tar.bz2 | |
Revert 155950 - Add initial Chromium TestShell support for Android
This makes check_deps fail on linux thusly:
Using base directory: src
Checking: src
WARNING: no package definition found in src/content/test/data/plugin/java_applet.java
WARNING: no package definition found in src/content/test/data/plugin/applet-tests/cookies/CookieTest.java
WARNING: no package definition found in src/content/test/data/plugin/applet-tests/authenticator/AuthenticatorTest.java
WARNING: multiple definitions of com.example.HelloLicenseServlet:
src/chrome/common/extensions/docs/examples/apps/hello-java/workspace/HelloLicense/src/com/example/HelloLicenseServlet.java
src/chrome/common/extensions/docs/examples/apps/hello-java/HelloLicenseServlet.java
ERROR in src/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
Illegal include: "content/public/android/java/src/org/chromium/content/app/LibraryLoader.java"
Because of no rule applying.
Illegal include: "content/public/android/java/src/org/chromium/content/browser/ContentView.java"
Because of no rule applying.
Illegal include: "content/public/android/java/src/org/chromium/content/common/CommandLine.java"
Because of no rule applying.
ERROR in src/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java
Illegal include: "content/public/android/java/src/org/chromium/content/app/LibraryLoader.java"
Because of no rule applying.
Illegal include: "content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java"
Because of no rule applying.
FAILED
Add a build target and tie it into android_all. This will build and link
Chrome code for a test apk for Android. When it runs it properly
loads the library but crashes. Will fix the crashes in subsequent
patches, but can fork that work after this is in.
BUG=136786
Review URL: https://chromiumcodereview.appspot.com/10918113
TBR=dtrainor@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10911202
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_delegate.h')
| -rw-r--r-- | chrome/app/chrome_main_delegate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h index 53b3827..3670dd5 100644 --- a/chrome/app/chrome_main_delegate.h +++ b/chrome/app/chrome_main_delegate.h @@ -16,7 +16,7 @@ class ChromeMainDelegate : public content::ContentMainDelegate { ChromeMainDelegate(); virtual ~ChromeMainDelegate(); - protected: + private: // content::ContentMainDelegate implementation: virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; virtual void PreSandboxStartup() OVERRIDE; |