summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_android.gypi
Commit message (Collapse)AuthorAgeFilesLines
* Use use_allocator instead of android_use_tcmalloc to switch the allocator.dmikurube@chromium.org2014-03-271-1/+2
| | | | | | | | | | See https://crrev.com/177353002 and the bug for the details. BUG=345554 Review URL: https://codereview.chromium.org/206413006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259894 0039d316-1c4b-4281-b951-d872f2087c98
* Rename chromium_testshell target to chrome_shell_apk.aurimas@chromium.org2014-03-121-16/+18
| | | | | | | | | | | | | | | | | | Final rename of ChromiumTestShell to ChromeShell. Now the new targets to build ChromeShell and ChromeShellTest APKs will be: chrome_shell_apk chrome_shell_test_apk This will better align with ContentShell and ContentShellTest APKs' targets: content_shell_apk content_shell_test_apk BUG=348137 TBR=mnaganov@chromium.org Review URL: https://codereview.chromium.org/189133005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256382 0039d316-1c4b-4281-b951-d872f2087c98
* Add UI hook for distilling web pages for test shell (relanding)nyquist@chromium.org2014-03-061-2/+2
| | | | | | | | | | | | | This adds the Java hooks needed and a menu option to distill the current web page in the test shell. Original CL: https://codereview.chromium.org/185113002/ BUG=319881 Review URL: https://codereview.chromium.org/183893029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255369 0039d316-1c4b-4281-b951-d872f2087c98
* Move ChromeShell files from chrome/android/testshell to chrome/android/shell.aurimas@chromium.org2014-03-061-5/+5
| | | | | | | | | BUG=348137 NOTRY=true Review URL: https://codereview.chromium.org/186843002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255258 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 254929 "Add UI hook for distilling web pages for test shell."nyquist@google.com2014-03-051-3/+2
| | | | | | | | | | | | | | | | | | > Add UI hook for distilling web pages for test shell. > > This adds the Java hooks needed and a menu option to distill the current > web page in the test shell. > > BUG=319881 > NOTRY=true > > Review URL: https://codereview.chromium.org/185113002 TBR=nyquist@chromium.org Review URL: https://codereview.chromium.org/187453003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254958 0039d316-1c4b-4281-b951-d872f2087c98
* Add UI hook for distilling web pages for test shell.nyquist@chromium.org2014-03-051-2/+3
| | | | | | | | | | | | This adds the Java hooks needed and a menu option to distill the current web page in the test shell. BUG=319881 NOTRY=true Review URL: https://codereview.chromium.org/185113002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254929 0039d316-1c4b-4281-b951-d872f2087c98
* Rename to ChromiumTestShell package from testshell to shellaurimas@chromium.org2014-03-041-2/+2
| | | | | | | | | | | | Rename org.chromium.chrome.testshell to org.chromium.chrome.shell Move res/ directory to chrome/android/shell/res/ BUG=348137 TBR=pfeldman,craigdh Review URL: https://codereview.chromium.org/184493006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254705 0039d316-1c4b-4281-b951-d872f2087c98
* Make TabBase non abstractdtrainor@chromium.org2014-01-061-15/+0
| | | | | | | | | | TabBase will build it's own native component if nobody overrides initializeNative(). BUG=277135 Review URL: https://codereview.chromium.org/108803002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243160 0039d316-1c4b-4281-b951-d872f2087c98
* Have jni_generator.gypi specify include_dirs to dependent targets.blundell@chromium.org2013-12-171-3/+0
| | | | | | | | | | | | Rather than each dependent target of a target that generates jni headers having to specify the appropriate include_dir manually, jni_generator.gypi can do it via direct_dependent_settings. TBR=darin@chromium.org Review URL: https://codereview.chromium.org/111493006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241216 0039d316-1c4b-4281-b951-d872f2087c98
* Check library version and handle library load errorsaberent@chromium.org2013-11-281-0/+1
| | | | | | | | | | | | | | | This CL modifies the build to incorporate the expected C++ library version in the Java code. This is then checked when the library is loaded, to make sure that the C++ and Java builds match. This CL also implements error handling when library loads fail or the loaded version doesn't match the expected version. BUG=311644 Review URL: https://codereview.chromium.org/59533009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237779 0039d316-1c4b-4281-b951-d872f2087c98
* Remove ant_build_out.thakis@chromium.org2013-11-281-1/+1
| | | | | | | | | | | | | | | build/java_apk,gypi defaults to something based on <(PRODUCT_DIR) for asset_location, so apparently it doesn't require an absolute path. Absolute paths are yucky, and the `pwd -P` pattern has led someone else astray, so remove it. BUG=none R=cjhopman@chromium.org TBR=avi Review URL: https://codereview.chromium.org/93023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237676 0039d316-1c4b-4281-b951-d872f2087c98
* Android: moves chrome/ to use long for JNIbulach@chromium.org2013-11-211-0/+1
| | | | | | | | | | Relands crrev.com/236278 BUG=317523 Review URL: https://codereview.chromium.org/80663002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236536 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 236278 "Android: moves chrome/ to use long for JNI"rch@chromium.org2013-11-201-1/+0
| | | | | | | | | | | | | | > Android: moves chrome/ to use long for JNI > > BUG=317523 > > Review URL: https://codereview.chromium.org/67573003 TBR=bulach@chromium.org Review URL: https://codereview.chromium.org/79463002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236286 0039d316-1c4b-4281-b951-d872f2087c98
* Android: moves chrome/ to use long for JNIbulach@chromium.org2013-11-201-0/+1
| | | | | | | | BUG=317523 Review URL: https://codereview.chromium.org/67573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236278 0039d316-1c4b-4281-b951-d872f2087c98
* Upstream Android printing code.cimamoglu@chromium.org2013-11-141-1/+0
| | | | | | | | | | | | | | | | With regards to the original downstream code, there are some differences: * PrintintControllerComponent(Impl) are renamed to PrintingController(Impl) * ChromeComponentFactory is renamed into PrintingControllerFactory * Some obsolete documentation removed/updated. More refactoring and tests will follow. BUG=315229 TBR=vitalybuka@chromium.org Review URL: https://codereview.chromium.org/64093004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235171 0039d316-1c4b-4281-b951-d872f2087c98
* Simple http fallback for the data reduction proxy.marq@chromium.org2013-10-241-16/+0
| | | | | | | | | | | | This CL adds a new command line option and preprocessor macro for a second proxy that the data reduction proxy feature will add to its configs as a fallback from the primary proxy. If the fallback proxy isn't defined, only the primary proxy is part of the configurations, and vice-versa. (Also fixes a bug where a http proxy specified on the command line would still be configured as HTTPS in the generated PAC file). BUG=306634 Review URL: https://codereview.chromium.org/30883003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230728 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unnecessary skia dependency in chromium test shellmiguelg@chromium.org2013-10-041-2/+0
| | | | | | | | | | Now that the infobars are not stubbed anymore it is not needed. BUG=280695 Review URL: https://codereview.chromium.org/26015003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227113 0039d316-1c4b-4281-b951-d872f2087c98
* Hacky Android dependency fix to allow infobar refactor patch to compile.pkasting@chromium.org2013-08-301-0/+2
| | | | | | | | | | BUG=280695 TEST=none TBR=miguelg Review URL: https://codereview.chromium.org/23836002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220641 0039d316-1c4b-4281-b951-d872f2087c98
* Android: fix linkage errors in chrome_android_core lib on clankium-tot.timvolodine@chromium.org2013-08-211-0/+1
| | | | | | | | | | | | Added content.gyp:content_app_browser target to chrome_android_core to get rid of linkage issues. The linkage issue was likely caused by https://chromiumcodereview.appspot.com/22909017/. BUG=276876 Review URL: https://chromiumcodereview.appspot.com/22806007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218749 0039d316-1c4b-4281-b951-d872f2087c98
* reland 'Set chrome_multiple_dll=1 by default on Windows in static_library'scottmg@chromium.org2013-08-211-0/+1
| | | | | | | | | | | Previously: https://codereview.chromium.org/22909017/ TBR=jam@chromium.org BUG=237249 Review URL: https://chromiumcodereview.appspot.com/23320004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218663 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 218286 "Set chrome_multiple_dll=1 by default on Windows i..."scottmg@chromium.org2013-08-191-1/+0
| | | | | | | | | | | | | | | | | | chrome_frame_net_tests and nacl_integration x86-32 broke. > Set chrome_multiple_dll=1 by default on Windows in static_library > > TBR=jam@chromium.org > R=jamesr@chromium.org > BUG=237249 > > Review URL: https://chromiumcodereview.appspot.com/22909017 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/23233003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218289 0039d316-1c4b-4281-b951-d872f2087c98
* Set chrome_multiple_dll=1 by default on Windows in static_libraryscottmg@chromium.org2013-08-191-0/+1
| | | | | | | | | | TBR=jam@chromium.org R=jamesr@chromium.org BUG=237249 Review URL: https://chromiumcodereview.appspot.com/22909017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218286 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Abandon bundling DevTools frontends for mobile appsmnaganov@chromium.org2013-06-271-2/+0
| | | | | | | | | | | | | | | | | From now, DevTools frontends are only served from the cloud using Blink revision number. This enabled all mobile Chromium apps (Chrome, Chromium TestShell, WebView) to be inspectable from chrome://inspect. An exception is made for Content Shell, as it will be used for running layout tests (including Inspector layout tests) on Android and thus it needs the frontend to be bundled. BUG=138925 TBR=jochen (to work around not formally having Android owners for chrome/browser/chrome_browser_main_android.*) Review URL: https://chromiumcodereview.appspot.com/17389005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208913 0039d316-1c4b-4281-b951-d872f2087c98
* Adds TCMalloc support for Chromium Test Shell on Android.bulach@chromium.org2013-06-041-0/+4
| | | | | | | | | | | Content shell support was added by crrev.com/201524 Extend support to chromium test shell. BUG=162208 Review URL: https://chromiumcodereview.appspot.com/16256013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203882 0039d316-1c4b-4281-b951-d872f2087c98
* Remove round trip from data reduction proxy authenticationbengr@chromium.org2013-05-271-1/+16
| | | | | | | | BUG=232932 Review URL: https://chromiumcodereview.appspot.com/14994003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202472 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Fix unit_tests and webview compilations for components build.yfriedman@chromium.org2013-04-121-1/+0
| | | | | | | | | | | | | | | What I missed in https://codereview.chromium.org/13494003/ is that jingle is also needed for unit tests. Other variants get it transitivitely through the 'service' process/target which is unused on Android. Also fixes a regression in component build for android_webview after some changes there. BUG=158821 Review URL: https://chromiumcodereview.appspot.com/14099007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193813 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] "Namespace" shared libraries for the component build yfriedman@chromium.org2013-04-041-1/+1
| | | | | | | | | | With the component build, we tell Dalvik to load each library separately by name. Some of our library names conflict with android shared libraries resulting our library not getting loaded. When building for components on Android, change the suffix of libraries to "cr.so" e.g. libnetcr.so to avoid colliding with Android's copies BUG=158821 Review URL: https://chromiumcodereview.appspot.com/13549002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192258 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Final changes to get chrome for android building with components.yfriedman@chromium.org2013-04-031-1/+1
| | | | | | | | | | | | | | | | | Unfortunately ImageLayerUpdater is used from the private repo. I know it's unenforced in chromium and thus subject to break, but we already have that issue with CC changes Also moves a dep from chromium_testshell to the shared chrome_android_core target. BUG=158821 NOTRY=true TBR=sky Review URL: https://chromiumcodereview.appspot.com/13494003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192184 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Introduce a Java parent class for Tab to mirror native class.yfriedman@chromium.org2013-03-291-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, there was only TabAndroid on the native side and no java counterpart. This makes it impossible to share code between testshell and Chrome on Android because Java is needed to interact with Android views and native with the rest of chrome. Getting the write native pointers assigned is tricky and the flow is as follow: Consumers should subclass TabBase in Java and TabAndroid in native. Construction of the Java subclass initializes the native subclass which passes the java pointer to TabAndroid so that TabAndroid can associate the java parent class (TabBase) with it. Destruction follows a similar flow. Once this building block is in place, I'll move more of TestShellTab into TabBase to re-use it. It also opens the door to upstream more of Tab. Also moves testshell-specific classes to the testshell libraries and out of Chrome for android. BUG=159202 TBR=sky NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12962006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191402 0039d316-1c4b-4281-b951-d872f2087c98
* Predex java librariescjhopman@chromium.org2013-03-271-17/+1
| | | | | | | | | | | | | dx supports merging of already dexed jars. This means we can dex jars as part of the library target and then just merge them when we build the apk. BUG=158821 Review URL: https://chromiumcodereview.appspot.com/12913009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191063 0039d316-1c4b-4281-b951-d872f2087c98
* Split apk-build.xml into 3 stepscjhopman@chromium.org2013-03-261-1/+1
| | | | | | | | | | | | | | | | In preparation for rewriting these actions in python, split apk-build.xml into smaller ant scripts. This should not change the functionality and mostly is just splitting the file and identifying the properties and defines required for each of the new files. Some of the configuration is moved out of ant and into gyp (i.e. the android_manifest_path is now gyp-configurable). Also, the ant scripts now use the correct basedir! That is, these ant scripts actually understand relative paths. To go along with this, resource_dir is the relative path to the resource directory (rather than a path relative to java_in_dir). BUG=158821 TBR=torne@chromium.org, brettw@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12963009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190712 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Make content_shell_apk and chromium_testshell components friendly.yfriedman@chromium.org2013-02-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | This includes the remaining changes to atleast _compile_ the above targets. More work is needed for starting up the apps and running. Inclues: - Misc EXPORT additions (I assume I can TBR these) - Introduce a ShellDialogs JNI registrar since it's now a separate component and ui can't depend on it. - Random gyp tweaks that are needed to fully specify dependencies - Change from using NPN_MemAlloc to just plain malloc for the java bridge. For some reason the NPN_MemAlloc symbol cannot be found in the component build, but regardless all our implementations end up calling straight throught to malloc. BUG=158821 TBR=wjia@chromium.org,willchan@chromium.org,jcivelli@chromium.org Review URL: https://chromiumcodereview.appspot.com/12281017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184173 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to support building a libchromeview.so with prebuilt sources.yfriedman@chromium.org2012-12-111-1/+4
| | | | | | | | | | | | | Change the JNI_OnLoad function such that it's always included the final shared_library artifact. This is necessary because of the use of exclude-libs=ALL which otherwise would hide that symbol. Instead, it relies on a static create function for ChromeMainDelegateAndroid which can be provided with other code in a prebuilt static library. Review URL: https://chromiumcodereview.appspot.com/11419317 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172440 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Remove build specs that were needed downstream.mnaganov@chromium.org2012-12-061-24/+0
| | | | | | | | | | | | The downstream patch has landed, we can now remove the leftovers. BUG=163955 R=torne@chromium.org TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/11438043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171527 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Split out/asset subdirectories for Chromium TestShell and Chrome.mnaganov@chromium.org2012-12-051-11/+22
| | | | | | | | | | | | | | Chromium TestShell includes DevTools frontend resources, which we don't want to have in Chrome for Android. BUG=163955 R=torne@chromium.org Review URL: https://chromiumcodereview.appspot.com/11415286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171230 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Bundle DevTools resources with Chromium TestShellmnaganov@chromium.org2012-11-291-1/+20
| | | | | | | | | | | | | | | | Since Chromium TestShell is a developers toy, one may need to change Chromium version number or make local modifications to DevTools front-end, so having it bundled feels more appropriate than using Chrome for Android's DevTools front-end hosting. R=dtrainor@chromium.org BUG=161506 Review URL: https://chromiumcodereview.appspot.com/11280149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170166 0039d316-1c4b-4281-b951-d872f2087c98
* Making it easier to hook a ContentViewCore to the SurfaceView.jcivelli@chromium.org2012-11-161-14/+0
| | | | | | | | | | | | | | | | | This CL changes the way we deal with WebLayers, so that a ContentViewCore does not need native code anymore to hook with the surface view. The ContentViewCore now keeps track of the WebLayers as they are attached/detached. The ContentViewRenderView is used to render a specific ContentView by retrieving the ContentViewCore WebLlayer and adding it to the compositor. BUG= TEST=ContentShell and ChromiumTestShell should still work. Review URL: https://chromiumcodereview.appspot.com/11293264 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168166 0039d316-1c4b-4281-b951-d872f2087c98
* Specify jar name for apks in java_apk.gypicjhopman@chromium.org2012-11-161-9/+4
| | | | | | | | | | | | | | | | Previously, we had to keep this name in sync in multiple places, the "fake" xxx_java target and in sdk-targets.xml. Instead, it should be set only in java_apk.gypi and then passed along to each of the places that we were specifying it before. Also, delete unused 'output' block and unneeded xxx_java dependencies. BUG= Review URL: https://chromiumcodereview.appspot.com/11363131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168148 0039d316-1c4b-4281-b951-d872f2087c98
* Refactoring Geolocation Infobar part4cramya@chromium.org2012-11-071-0/+2
| | | | | | | | | | | | | | | | Changes in this CL. One google_location_settings_helper.h can be implemented separately for chrome and unit_tests. Removed google_location_settings_helper_factory.* Removed the java GoogleLocationSettingsHelper files Added 3 new unittests to test the new android infobar functionailty. BUG=152236 Review URL: https://chromiumcodereview.appspot.com/11369065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166343 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing Android OS check.aurimas@chromium.org2012-10-111-1/+1
| | | | | | | | | Fixing Android OS check. Review URL: https://chromiumcodereview.appspot.com/11093082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161444 0039d316-1c4b-4281-b951-d872f2087c98
* Move shared library copy and strip to java_apk.gypicjhopman@chromium.org2012-10-111-15/+2
| | | | | | | | | | | | | Also, for each such shared library included in an apk, create a link in the appropriate directory in <(android_product_out) to enable annotating native stack traces for those apks. BUG= Review URL: https://chromiumcodereview.appspot.com/11096038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161440 0039d316-1c4b-4281-b951-d872f2087c98
* Rename output jar created by apks to have chromium_apk_ prefix.shashishekhar@chromium.org2012-10-111-5/+6
| | | | | | | | | | | | | Output jar created by apks, currently have chromium_ prefix, this prefix is also used by jar targets, to avoid name space collision change the prefix from chromium to chromium_apk. BUG= Review URL: https://chromiumcodereview.appspot.com/11094015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161238 0039d316-1c4b-4281-b951-d872f2087c98
* Fix chromium testshell crash on startup.yfriedman@chromium.org2012-10-091-0/+1
| | | | | | | | After http://codereview.chromium.org/10876056/, we need to include chrome's pak files in testshell. Review URL: https://codereview.chromium.org/11092032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160958 0039d316-1c4b-4281-b951-d872f2087c98
* Make java.gypi use all_dependent_settings for input_jars_pathscjhopman@chromium.org2012-10-091-5/+3
| | | | | | | | | | | | | | | | | | all_dependent_settings is more like the link_settings that we would like to use here. This variable is used by java targets to set the classpath for javac, i.e. to set the libraries that are needed by the target. Use of direct_dependent_settings with export_dependent_settings causes unnecessary duplication of all java dependencies for all of our java library targets. BUG=146049 TBR=sky,brettw Review URL: https://chromiumcodereview.appspot.com/10986094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160768 0039d316-1c4b-4281-b951-d872f2087c98
* Make some apk targets not refer directly to output .class files from other ↵cjhopman@chromium.org2012-09-271-1/+34
| | | | | | | | | | | | | | | | | | | targets This requires making chromium_testshell create a .jar like content_shell currently is. Then, chromium_testshell_test and content_shell_test can just depend on the new _java targets for the apk that they instrument and get the .jar in their classpath. See: http://crrev.com/10969020 for the similar gyp change to content_shell. BUG=146568 Review URL: https://chromiumcodereview.appspot.com/10978033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159149 0039d316-1c4b-4281-b951-d872f2087c98
* Add rendering support to the TestShell.dtrainor@chromium.org2012-09-251-0/+15
| | | | | | | | | | | | - Tie the Compositor into the TestShell. - Tie a really basic Tab into the TestShell. BUG=http://crbug.com/136786 Review URL: https://chromiumcodereview.appspot.com/10968003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158654 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for the ChromiumTestShellTest APK.dtrainor@chromium.org2012-09-211-33/+11
| | | | | | | | | | | | | - Add the gyp rules for the ChromiumTestShellTestAPK. - Add the initial APK base class. - Add a sample test that launches the activity. BUG= Review URL: https://chromiumcodereview.appspot.com/10943014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158106 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Revert 155950 - Add initial Chromium TestShell support for Android"dtrainor@chromium.org2012-09-131-0/+140
| | | | | | | | | | | | | | | | Fixed build breakages: -Had to add DEPS file for testshell/java. -Something changed with ant from the time I tested and the time my CL got committed. Had to move sdk-targets.xml import in the ant file to the end of the file. This reverts commit 2d30dc03dc0bd0723236c549313774119f163056. BUG= Review URL: https://chromiumcodereview.appspot.com/10905209 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156458 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 155950 - Add initial Chromium TestShell support for Androidthakis@chromium.org2012-09-111-140/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add initial Chromium TestShell support for Androiddtrainor@chromium.org2012-09-111-0/+140
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155950 0039d316-1c4b-4281-b951-d872f2087c98