| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Android 4.4.4 Release 1
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Android Intents have a selector field which, if present, are used
to search for the Activity to invoke. These must also be sanitized
before handing off to the OS.
BUG:14562482
Change-Id: I30461e11be48ec623ab0f56d0d0f206dc2849c98
|
| |
| |
| |
| | |
Change-Id: I471e284104467cd299072fbb6704f30d61e6ac02
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Android 4.4.3 release 1
Conflicts:
chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
Change-Id: Ia744b48e21220c90da11ded272e73601270d21a7
|
| |
| |
| |
| |
| |
| |
| |
| | |
The frameworks/webview project contains code from the Chromium
project which needs a copy of the Chromium license.
Bug: 13789162
Change-Id: I15e6984321f1ca2cc03d76ce36a4bbf49349e67c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To work around framework resource IDs not being constant, go back to
building webviewchromium.jar from source.
This reverts commit 9c9341f1d2368b4209fe982f3f1c5de384f67fb7.
Orignal Bug: 11426593
Bug: 11324052
(cherry picked from commit cf686f7adb1cbc4efe3e93ae69b040d328b0e23f)
Change-Id: Id4e9d644f832fe3ecee9d2cc31234359857ce8c9
|
| |
| |
| |
| |
| |
| | |
BUG: 13514997
Change-Id: I8414b7caf3a7fb6770242dd4d1640ff89c9be26a
|
| |
| |
| |
| |
| | |
BUG: 13328348
Change-Id: Ib8f21cb18b22937bb6108d6a48d996dd5ebb055a
|
| |
| |
| |
| |
| |
| |
| |
| | |
This updates resources to match the upstream M33 release branch
at r254123.
BUG: 11964789
Change-Id: I0561b916b242d310d291d8c403bb04f415492889
|
| |
| |
| |
| |
| | |
Change-Id: I04d722ba942122591211d03696964fab0e781930
Auto-generated-cl: translation import
|
| |
| |
| |
| |
| |
| | |
This reverts commit 82fd1199a69c681c79ca1aa6d7a49c47afc1d33e.
Change-Id: Idfb2df3132dad448aeadde18e2d1a72ada8a2d79
|
| |
| |
| |
| |
| |
| |
| |
| | |
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.
Change-Id: I2267327ddc0244fc255f4ec2981ac069d30823d1
|
| |
| |
| |
| |
| |
| |
| |
| | |
To support multiarch arm/arm64 builds, copy the top-level makefile so
that the same makefiles will be used for arm64 as are currently used for
arm.
Change-Id: I79bff65dd57e6528ab543b090203553849c665e4
|
| |
| |
| |
| | |
Change-Id: Ib74f8d7a46a25b94a1684c9b05ee2ccafbdcc4ff
(cherry picked from commit 6b18e81fbb548f00151092bf7a9cb6e23733e934)
|
| |
| |
| |
| |
| |
| | |
Remove @override to fix a build break in master-gpl branch.
Change-Id: Id3f58dbecfec4a806f7857a6c1c73954e1bdd6e3
(cherry picked from commit 106c4320b02fb790d9955de133013662bbdc3094)
|
| |
| |
| |
| |
| |
| |
| |
| | |
(Cherry pick from master-chromium)
This seems to be useful for tracking app's interaction with WebView
Change-Id: I1a88f4d2296a822a2d1c0afe398fbc621a3352f0
(cherry picked from commit d7ad43dc1ed52dc48532738c950ea825e9b7def0)
|
| |
| |
| |
| |
| |
| | |
This relands the original commit c673dbdbfa853ed101dfc9193a34c14b5134cc78. The gn binary build process has been fixed upstream so that it generates Debian-compatible binaries.
Change-Id: I58a418b7ca2c6ed976367d116d06f65b851fbe79
(cherry picked from commit d7fe98f16c652eb648ff5668a2d81858458c18f6)
|
| |\
| | |
| | |
| | |
| | |
| | | |
This commit was generated by merge_to_master.py.
Change-Id: Icfa82bbab9ec740b58774edc9faf8f0097847e5a
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is no longer needed and replaced by third_party/angle.
Change-Id: I19c8303745dd0211e96416fe77c3c4f0a3f0e2cc
|
| | |\
| | | |
| | | |
| | | | |
wont be sent"" into master-chromium
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
be sent"
This reverts commit f401798d628ddb492defeb0a00bf289284d1677a.
This code was moved upstream: http://crrev.com/110573003
BUG=10570052
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Chromium needs third_party/angle again.
Change-Id: I886614fe0bf538b69e0a4cbda58edc59de526c36
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 477b059d2035e22280f5ee2892d257b035cca32e.
Change-Id: I3cb22edb023bee31ebf66c166be9ca52eeb44420
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 0820c3d292380d5f06017de0877706b4924f0c60.
Change-Id: I95f17cb99d2e565a416d3e918d6d7ade6c0d9589
|
| | |/
| | |
| | |
| | |
| | | |
Bug: 11481260
Change-Id: If8782f7a00904ceea7bad61e5296e12e23315001
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I88b2f7712e6f78b73963c8ef7bceffc56b49ed9b
Auto-generated-cl: translation import
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ibed719c3b7e082f04b34ed7b269a61cf58a5a517
Auto-generated-cl: translation import
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic461aac635891501fcb85a0faa2fffeadb47d6cf
Auto-generated-cl: translation import
|
| |\|
| | |
| | |
| | |
| | |
| | | |
This commit was generated by merge_to_master.py.
Change-Id: Ia61470ff57c573bccec9f7c9043bab7ac8d41fa5
|
| | |\
| | | |
| | | |
| | | | |
Android"" into master-chromium
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add resources introduced in crrev.com/r239290
Change-Id: I5788a60e9f98164f09cccd291fda767b2de97d8c
|
| | |\ \
| | | |/
| | |/|
| | | | |
master-chromium
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit c673dbdbfa853ed101dfc9193a34c14b5134cc78. The downloaded gn is not compatible with the automerger's version of libc; don't attempt to download it.
Change-Id: Ice705f9dc344b7662535f37810701b19e7b08f72
|
| | |/
| | |
| | |
| | | |
Change-Id: I73c193454cb9cb2e8a77981675395e9c06844ae2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The gyp process now needs to run gn to generate some of the gyp files as
part of the gyp->gn transition. Normally this is downloaded by runhooks,
but we don't run hooks during the merge. Just copy the download command
from DEPS for now.
Change-Id: Ide64ccd156b6eb5a0dee6c8732a7ab7ab88dea50
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 7621527
Match the upstream changes of crrev.com/23026006
Change-Id: I5645388cb599affc4ee8ed6e93cada330084286b
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Bug: 10288759
Klp-XX branches already have printing support. This is to add
printing to master. Depends on crrev.com/54963005
The original change was 412d84be859ce0eb91baf2f9afe5e6326a15d76a
Change-Id: Ia2d0685b7fd01e1251aed2e4a673d2544d47bba5
|
| | |\
| | | |
| | | |
| | | | |
master-chromium
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If getCookieManager is called without Chromium having been started, set
the application context but don't start Chromium. The native code will
create a temporary cookie manager.
Bug: 10969703
Change-Id: Ic1bd67d352dee78a761a4abf549cd9ba9ddb9f8d
(cherry picked from commit 9dab5652ee2433cb990baca967d4331be0b2d3f3)
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '26ed03a28a28395f14c119f4bc723c09a9d6547b':
DO NOT MERGE: Support a prebuilt WebView.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the product sets PRODUCT_PREBUILT_WEBVIEWCHROMIUM, do not attempt to
build most of the WebView from source; build only
libwebviewchromium_plat_support.
Bug: 10824652
Change-Id: I0e7b791c7afa7221b0593a432a8d6ca45ea995cc
|
| |\| | |
| | | | |
| | | | |
| | | | | |
* commit '52c771c927739d2a4108313d463b8b93c0fb460e':
|
| | |\ \ \ |
|
| |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
translations. DO NOT MERGE
* commit '26c0eaa0b61b34499180260c2ac9543199589955':
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'bc0f8d3645329287c8965168672def96c6c8212f':
Import translations. DO NOT MERGE
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '5fc2b7c0aa383e8c693e7292081e81c6a2944d53':
Import translations. DO NOT MERGE
|
| |\| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
WebView."
* commit '8009977db575433507a018e0bc903376aac6815d':
|
| | |\| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '3ba0b9a13dadcc75e2078c6a6567d8656360b160':
Revert "Support a prebuilt WebView."
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'cf686f7adb1cbc4efe3e93ae69b040d328b0e23f':
Revert "Support a prebuilt WebView."
|