summaryrefslogtreecommitdiffstats
path: root/android_webview/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Since some child processes, such as PPAPI_BROKER plugin, might not run in ↵kjyoun@google.com2013-03-191-2/+2
| | | | | | | | | | | sandbox, Sandboxed process is renamed to Child process BUG=178382 Review URL: https://chromiumcodereview.appspot.com/12321131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188907 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: add ResultCodes to generated sources.torne@chromium.org2013-03-071-0/+1
| | | | | | | | | | | | r186610 added a new java_cpp_template file which is used by code in android_webview; add it to the list of things to pull in to the Android.mk based build. BUG= Review URL: https://codereview.chromium.org/12606002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186703 0039d316-1c4b-4281-b951-d872f2087c98
* [Android WebView] Fix paths to generated files after r185702mnaganov@chromium.org2013-03-041-5/+5
| | | | | | | | | | | NOTRY=true R=torne@chromium.org Review URL: https://chromiumcodereview.appspot.com/12398006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185888 0039d316-1c4b-4281-b951-d872f2087c98
* Use _target_name instead of package_name for java*.gypicjhopman@chromium.org2013-02-201-1/+1
| | | | | | | | | | | | | | | We were using package_name as a unique name for naming output files and directories. package_name was typically the same as _target_name or a variation of it (like dropping _apk). Using _target_name instead means we need to specify one less thing and it is (maybe?) guaranteed to be unique. TBR=brettw,joi,jar,fischman,zea,sky BUG= Review URL: https://chromiumcodereview.appspot.com/11308030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183639 0039d316-1c4b-4281-b951-d872f2087c98
* [Android WebView] Remove obsolete webviewchromium_strings.pak references.benm@chromium.org2013-02-191-7/+0
| | | | | | | | | We are now using the locale paks instead. Review URL: https://chromiumcodereview.appspot.com/12230058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183269 0039d316-1c4b-4281-b951-d872f2087c98
* Fix downstream android webview buildboliu@chromium.org2013-02-131-3/+4
| | | | | | | | | | | Fix for change in crrev.com/182280. These files are not used in any upstream build. BUG= Review URL: https://codereview.chromium.org/12258017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182295 0039d316-1c4b-4281-b951-d872f2087c98
* [Android WebView] Add rules to bundle localised string paks.benm@chromium.org2013-02-121-1/+319
| | | | | | | | | | | Add makefile rules to install the built webkit string paks into the system image. Review URL: https://chromiumcodereview.appspot.com/12223093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181976 0039d316-1c4b-4281-b951-d872f2087c98
* [Android WebView] Fix build break, make sure the gyp file is generated for ↵kristianm@chromium.org2013-02-121-1/+2
| | | | | | | | | | | | | android webview NOTRY=true TBR=benm@chromium.org BUG= Review URL: https://codereview.chromium.org/12210130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181853 0039d316-1c4b-4281-b951-d872f2087c98
* Move content/components/navigation_interception to src/componentskaiwang@chromium.org2013-01-231-1/+1
| | | | | | | | BUG=169312 Review URL: https://chromiumcodereview.appspot.com/11830043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178238 0039d316-1c4b-4281-b951-d872f2087c98
* Move content/components/web_contents_delegate_android to ↵boliu@chromium.org2013-01-121-1/+1
| | | | | | | | | | | | | components/web_contents_delegate_android Moving files, change namespace from content to components, added/updated DEPS files, and fix builds BUG=169312 Review URL: https://chromiumcodereview.appspot.com/11823046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176598 0039d316-1c4b-4281-b951-d872f2087c98
* Fix downstream android webview build from r175537boliu@chromium.org2013-01-081-0/+4
| | | | | | | | | | | | | | | guava and jsr305 libraries are already present in the downstream build, just need to not use the upstream third_party version and modify the build script BUG= TBR=torne@chromium.org Android only build fix. Ran through android bots with compile step. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11822002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175600 0039d316-1c4b-4281-b951-d872f2087c98
* Generate PageTransitionTypes.java for Androidboliu@chromium.org2012-12-161-1/+3
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/11577016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173372 0039d316-1c4b-4281-b951-d872f2087c98
* WebView fix for third_party/eyesfreeboliu@chromium.org2012-12-141-1/+5
| | | | | | | | | | | | | R=joth@chromium.org Does not affect upstream builds NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/11565045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173205 0039d316-1c4b-4281-b951-d872f2087c98
* [Android Webview] Add hand-written R.java file to map ui resources.newt@chromium.org2012-12-141-1/+2
| | | | | | | | | | | This provides hand-maintained R.java files to enable Webview to provide resources used in ui, and fix the current webview ToT build break. BUG=165751 Review URL: https://codereview.chromium.org/11578034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173201 0039d316-1c4b-4281-b951-d872f2087c98
* Fix android build issue.boliu@chromium.org2012-12-111-1/+3
| | | | | | | | | | | r172350 added a new generated java file. dcommit because these files do not affect chromium builds BUG= Review URL: https://codereview.chromium.org/11537015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172381 0039d316-1c4b-4281-b951-d872f2087c98
* [Android WebView] Remove pak rules that depend on chrome/benm@chromium.org2012-12-111-19/+0
| | | | | | | | | | | | These rules are no longer needed and finally break android_webview's ties with the chrome/ layer! Android only; android bots green NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11511003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172304 0039d316-1c4b-4281-b951-d872f2087c98
* Fix android build typoboliu@chromium.org2012-12-101-1/+1
| | | | | | | | | | TBR=torne BUG= NOTRY=true Review URL: https://codereview.chromium.org/11488014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172146 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: fix location of NetError.java.torne@chromium.org2012-12-101-1/+2
| | | | | | | | | | | | | net.gyp:net_errors_java was updated to put the output in a new location; update the WebView Android.mk to match. BUG= TBR=digit@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11506008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172098 0039d316-1c4b-4281-b951-d872f2087c98
* [Android Webview] Fix typobenm@chromium.org2012-12-101-1/+1
| | | | | | | | | | | Typo introduced in https://codereview.chromium.org/11475035/ TBR=torne NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11500010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172061 0039d316-1c4b-4281-b951-d872f2087c98
* [Android WebView] Rename android_webview paks to webviewchromium.benm@chromium.org2012-12-071-6/+6
| | | | | | | | | | Android bots green. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11475035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171876 0039d316-1c4b-4281-b951-d872f2087c98
* [Android WebView] Add new chrome/-less pak dependency.benm@chromium.org2012-12-061-0/+15
| | | | | | | | | | | | | | | | android_webview must not depend on the chrome/ layer, so we want to remove the last dependencies we have for generating resource paks. Toward this, define a new android_webview pak that depends only on content/ resources. A later change will remove the dependency on the paks that contain chrome/resources. For now we use the same resources Content Shell does. It may be possible to trim this further, but seems like a good starting point. Android only, Android bots green NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11348326 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171522 0039d316-1c4b-4281-b951-d872f2087c98
* [android_webview] Remove chrome/ Java and R dep.mkosiba@chromium.org2012-11-291-7/+1
| | | | | | | | | BUG= Review URL: https://chromiumcodereview.appspot.com/11434005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170216 0039d316-1c4b-4281-b951-d872f2087c98
* [Android Webview] Add hand-written R.java files to map resources without ↵leandrogracia@chromium.org2012-11-211-0/+5
| | | | | | | | | | | | | DEPS issues. This applies the fix proposed by 11308140, but moving the R.java files to folders where they don't introduce a DEPS violation. BUG=136704 Review URL: https://codereview.chromium.org/11416130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169047 0039d316-1c4b-4281-b951-d872f2087c98
* Move WebContentsDelegateAndroid to content/componentsjknotten@chromium.org2012-11-141-1/+2
| | | | | | | | | | | | | | | | | | | | | 1. Move chrome/browser/component/web_contents_delegate_android to content/components/web_contents_delegate_android. 2. Rename package org.chromium.chrome.browser.component. web_contents_delegate_android to org.chromium.content.components. web_contents_delegate_android. 3. Remove shouldOverrideUrlLoading from WebContentsDelegateAndroid interface, which is no longer required. I will follow up with a second change to completely remove chrome/browser/component/web_contents_delegate_android once external dependencies on it have been removed. BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11365199 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167670 0039d316-1c4b-4281-b951-d872f2087c98
* Move navigation interception component to content/componentsjknotten@chromium.org2012-11-091-1/+2
| | | | | | | | | | | | | | | | | | | | 1. Move C++ source from chrome/browser/component/navigation_interception to content/components/navigation_interception. 2. Change the namespace from navigation_interception:: to content:: 3. Change Java package from org.chromium.chrome.browser.components. navigation_interception to org.chromium.content.components. navigation_interception. I will follow up with another patch to completely remove chrome/browser/component/navigation_interception once external dependencies have been updated to use the component at its new component BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11293017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166883 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 166758 - Move navigation interception component to content/componentsraymes@chromium.org2012-11-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke the build at http://build.chromium.org/p/chromium.linux/builders/Android%20Builder%20%28dbg%29/builds/20261 Original commit message follows: 1. Move C++ source from chrome/browser/component/navigation_interception to content/components/navigation_interception. 2. Change the namespace from navigation_interception:: to content:: 3. Change Java package from org.chromium.chrome.browser.components. navigation_interception to org.chromium.content.components. navigation_interception. I will follow up with another patch to completely remove chrome/browser/component/navigation_interception once external dependencies have been updated to use the component at its new component BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11293017 TBR=jknotten@chromium.org Review URL: https://codereview.chromium.org/11361177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166764 0039d316-1c4b-4281-b951-d872f2087c98
* Move navigation interception component to content/componentsjknotten@chromium.org2012-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | 1. Move C++ source from chrome/browser/component/navigation_interception to content/components/navigation_interception. 2. Change the namespace from navigation_interception:: to content:: 3. Change Java package from org.chromium.chrome.browser.components. navigation_interception to org.chromium.content.components. navigation_interception. I will follow up with another patch to completely remove chrome/browser/component/navigation_interception once external dependencies have been updated to use the component at its new component BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11293017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166758 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: remove resources.pak from build.torne@chromium.org2012-10-291-5/+0
| | | | | | | | | | | | We don't need resources.pak any more as it's never loaded and only contains resources used by code in src/chrome/. Don't depend on it or package it into the test APK. BUG= Review URL: https://codereview.chromium.org/11326002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164624 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: fix locale pak location.torne@chromium.org2012-10-221-1/+2
| | | | | | | | | | | | We need to copy the locale paks into the same directory as all the other paks, not into a locales/ subdirectory, because that's what the android code expects. Tweak the Android makefile slightly to do this. BUG= Review URL: https://codereview.chromium.org/11228030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163307 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: add resource paks to the Android build.torne@chromium.org2012-10-221-0/+25
| | | | | | | | | | | | | We need to install the Chromium resource paks that webview depends on into the Android system image. This requires adding them as dependencies of the WebView All target, and defining custom Android build rules to copy them to the right place. BUG= Review URL: https://codereview.chromium.org/11235002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163266 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: fix build issues and nits.torne@chromium.org2012-10-181-3/+6
| | | | | | | | | | | | | | | | | 1) The top-level Android.mk mustn't use my-dir after including another file as it returns the wrong answer. 2) We need "All" to depend on net_errors_java as it's used by the Android.mk. 3) Fix nits from previous review of android_webview/Android.mk - make it clearer that only one of the dependencies is temporary. BUG= Review URL: https://codereview.chromium.org/11187052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162716 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: create a java module.torne@chromium.org2012-10-171-0/+39
The WebView needs a bunch of Java code from the Chromium tree (contentview and its dependencies) in order to build. Introduce an Android build system makefile into android_webview which builds a suitable static java library. R=benm@chromium.org BUG= Review URL: https://codereview.chromium.org/11185025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162404 0039d316-1c4b-4281-b951-d872f2087c98