summaryrefslogtreecommitdiffstats
path: root/chromium/tools
Commit message (Collapse)AuthorAgeFilesLines
* Remove no-longer-used webview glue sources.Torne (Richard Coles)2015-05-288-1635/+0
| | | | | | | | | | The WebView glue code no longer lives in Android, it's in the Chromium repository with the rest of the WebView implementation. Remove the unused sources, the unused build configuration, and also the obsolete scripts for running the downstream buildbot and merging Chromium changes into Android. Change-Id: If45550f5951bc7773c7ed011c05f845d1b65251b
* [Android WebView] Delete WebViewShell.Tim Volodine2015-04-2010-372/+0
| | | | | | | WebViewShell now lives in the chromium repository, so this patch removes it from the android checkout (see crbug.com/475084). Change-Id: I88dfc95eeb4597d38e936d2b13f801bbf5509fbb
* Add WebViewBrowserActivity and cleanup to WebViewShell.Tim Volodine2015-03-233-13/+72
| | | | | | | Add activity for displaying urls for testing in WebViewShell. Also clean up some bits while at it. Change-Id: Id3a78328493be5ca2ebb0b9393f08387999315a7
* Merge scripts: rename merge_to_master.py -> merge_to_android.pyPrimiano Tucci2014-09-252-0/+16
| | | | | | | | | | | - Add an extra check to merge_from_chromium.py to ascertain that the remote branch exists locally. - Rename merge_to_master.py -> merge_to_android.py: the former name is confusing when we merge to M* branches. The new name is also more consistent with merge_from_chromium.py - Warn if the GYP_DEFINES env var is set. Change-Id: I180f9c27a106f31a7e472b14bfcacb2a7444d534
* Add startup time tests to the WebViewShellMarcin Kosiba2014-09-224-0/+82
| | | | | BUG: 16870075 Change-Id: I3f5221accdf2e3ca9a05b1c030eb8d74a2ec12e2
* Fix LASTCHANGE in merge_from_chromium.py when merging a release.Primiano Tucci2014-09-101-7/+15
| | | | | | | | | The previous changes to merge_from_chromium caused the script to crash when generating LASTCHANGE for a release. This fixes the crash by using the SHA1 of the upstream merge parent to generate LASTCHANGE. Change-Id: I34ff309400135bb09a91e7e32a9eb1aea1e8c310
* Update the merge_to_master.py script for Git.Primiano Tucci2014-09-103-157/+331
| | | | | | | | | | | | | | Changes the merge_to_master.py script to deal with the Chromium's switch to Git. Furhermore, this change introduces pedantic checks when merging a given master-chromium snapshot (using a repo.prop file), verifying that the projects SHAs in the archive match the SHAs in the repo.prop. Shouldn't this happen, it analyzes the history of the mismatching projects and prints out a detailed error message. In case of a mismatch, the merge can be forced using the --force option. Change-Id: I8909d064709921220afbed1cc55cbcc7c48ececa (cherry picked from commit 18e8e49dbb79d50be03314b30f997cfa8561c347)
* Revert "Revert "Add libjpeg_turbo to merge list.""Richard Coles2014-09-041-0/+1
| | | | | | This reverts commit b77c162ab29152d6a4d81be3edd1f650602172f4. License issue is now fixed. Change-Id: I543e1fdb4709cd020673b74c4214147eecacba77
* Revert "Add libjpeg_turbo to merge list."Richard Coles2014-09-041-1/+0
| | | | | | | | License is not marked as Android compatible. This reverts commit 7dcc1a97013a6700f794747157798737ff03a28e. Change-Id: Iae457f85ed552e9ceb48bf33df25b6d3955ef6b8
* Add libjpeg_turbo to merge list.Torne (Richard Coles)2014-09-041-0/+1
| | | | | | | To allow us to stop depending on the system libjpeg, start merging chromium's libjpeg_turbo. Change-Id: Idb1e211b99e0be23185e6598912905956145cd66
* Remove openssl from merged projects list.Torne (Richard Coles)2014-08-271-1/+0
| | | | | | | OpenSSL has been replaced by boringssl upstream and no longer exists in DEPS. Change-Id: Idb3ad563ead2a48b98196359a65bde9fa52da90e
* Update merge_from_chromium.py after Chromium Git migration.Primiano Tucci2014-08-261-111/+69
| | | | | | | | | Chromium has switched to Git. SVN is not the source of truth anymore. The following change removes --svn support from merge_from_chromium.py and makes it understand git. Also, this is removing the --lkgr option, as LKGR is being deprecated in chromium. Change-Id: I879e9cda2cee313f1e2409a1a85b173db59efd8c
* Fix merge_from_chromium.py script to work with new buildspec repoBo Liu2014-08-141-2/+4
| | | | | | | | | | New repo at https://chrome-internal.googlesource.com/chrome/tools/buildspec The updated script will work with 37.0.2062.70 in the 37.0.2062 branch. Change-Id: I298f66e15bbf98ea9d83fc7e4b67efb9b19e0d4c (cherry picked from commit 37b38e94b68b98cc79e412f53e38efe69bfaca27)
* Add boringssl to automerger script.Ben Murdoch2014-07-281-0/+1
| | | | | Bug: 16357554 Change-Id: I0eaadb010c42424cefa8f2f07f5a89cdf086f540
* Remove libaddressinput hook.Torne (Richard Coles)2014-06-191-3/+0
| | | | | | This hook has been deleted upstream and isn't needed any more. Change-Id: Ide487739c6111ff38b09353781097b4c315dc162
* Merge scripts: fix hook.Torne (Richard Coles)2014-06-161-1/+1
| | | | | | | There's no 'src' directory in our checkout, so the hook wasn't found. Fix it. Change-Id: Ibc6b4ba1e6849bfd1bf67acc91fed75bdb06bc47
* Merge scripts: run the libaddressinput hook.Torne (Richard Coles)2014-06-161-9/+3
| | | | | | | | | | The libaddressinput hook from DEPS needs to be run to make our build work; copy it to the merge script for now as we still haven't got a better way to deal with hooks. Remove the old hook that downloaded gn from google storage as this is not necessary at present and is unlikely to be needed in future either. Change-Id: I04facd61fba554fcfc0093ef8bc907474d6c1d07
* Add libaddressinput to the merged project list.Martin Kosiba2014-06-131-0/+1
| | | | Recent chromium revisions need this.
* Revert "Add libaddressinput to the merged project list."Richard Coles2014-06-121-1/+0
| | | | | | This reverts commit 13e2ded0ee997ac247ce18be587125c149f9c4c9. Change-Id: If3f87f147a26a6d552483f34e25a039a7f830598
* Add libaddressinput to the merged project list.Torne (Richard Coles)2014-06-121-0/+1
| | | | | | Recent chromium revisions need this. Change-Id: Ia6ce4dce65c3fe3d06275bfbb8faf68b881775f1
* Update merge project list for new skia.Torne (Richard Coles)2014-05-241-3/+1
| | | | | | | Skia now just has a single DEPS entry instead of three; update project list. Change-Id: Ia09647279d09ec622d174ce710656223a1b2fb7d
* automerger: always fetch the SHA1.Torne (Richard Coles)2014-05-161-6/+1
| | | | | | | | Some projects in chromium are now tracking branches other than master even in trunk, so the default "git fetch" doesn't work for them. Always fetch the specific SHA1. This requires git 1.8 or greater. Change-Id: Ief417d4e61e06b26d491f09a384f86662e168803
* Add third_party/openmax_dl to merge list.Ben Murdoch2014-04-301-0/+1
| | | | Change-Id: I27a9def2b9c5cadcbc3b6ed63dfd3ffdc9021d4d
* Revert "Merge scripts: duplicate arm makefile for arm64."Torne (Richard Coles)2014-04-071-8/+0
| | | | | | | | We no longer need to duplicate the arm makefiles for arm64, as we include the arm makefile from the top-level Android.mk as well to support multilib builds. This reverts commit 4a4e55409b32f638e45fd8ab1ba8de512400c4f9.
* Add third_party/usrsctp to merged projects.Torne (Richard Coles)2014-02-241-0/+1
| | | | | | | Add external/chromium_org/third_party/usrsctp/usrsctplib as it's needed by WebRTC. Change-Id: Ibc75300d1962e8290b18f0f00ab0150a7d7ef41a
* Merge scripts: add webrtc projects to merge.Torne (Richard Coles)2014-02-121-0/+4
| | | | | | Merge libsrtp, libvpx, libyuv, and webrtc, for chromium webrtc support. Change-Id: Ib9187ae83cc2643cc399b1c4700d621b919a6494
* Merge scripts: duplicate arm makefile for arm64.Torne (Richard Coles)2014-01-301-0/+8
| | | | | | | 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
* First jank test for Android WebviewAnthony Berent2014-01-163-2/+70
| | | | | | | | | | Includes both the test, and the dummy application that is tested. Only tests flinging. This is based on the old BrowserFlingTest, but, since BaseBrowserFlingTest is no longer maintained, and there is only one browser type here, it merges that code into WebViewFlingTest. BUG=11266902 Change-Id: I7c246d5d97bb70d119cb1fab9a7c538bef17bcd1
* Merge "Reland "automerger: download gn before generating makefiles."" into ↵Richard Coles2013-12-181-0/+11
|\ | | | | | | master-chromium
| * Reland "automerger: download gn before generating makefiles."Richard Coles2013-12-181-0/+11
| | | | | | | | | | | | 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
* | Add third_party/brotli/src to the list of projects to merge.Martin Kosiba2013-12-171-0/+1
| | | | | | | | Change-Id: I4e89adb1dfbd2baa2b57c30246a330862032732f
* | Do not merge third_party/angle_dx11Bo Liu2013-12-161-1/+0
| | | | | | | | | | | | This is no longer needed and replaced by third_party/angle. Change-Id: I19c8303745dd0211e96416fe77c3c4f0a3f0e2cc
* | Add third_party/angle to merged project list.Torne (Richard Coles)2013-12-131-0/+1
|/ | | | | | Chromium needs third_party/angle again. Change-Id: I886614fe0bf538b69e0a4cbda58edc59de526c36
* Revert "automerger: download gn before generating makefiles."Richard Coles2013-12-111-11/+0
| | | | | | 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
* automerger: download gn before generating makefiles.Torne (Richard Coles)2013-12-051-0/+11
| | | | | | | | | 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
* Add third_party/sfntly to merged project list.Torne (Richard Coles)2013-11-221-0/+1
| | | | | | Merge third_party/sfntly from Chromium to support skia printing. Change-Id: I26f08c81f4d7e0aab64ab51edecec3632df6d619
* Merge scripts: fix force pushing to temp branch.Torne (Richard Coles)2013-09-101-1/+1
| | | | | | | | | In the refactoring of the script to suport branch merges I accidentally lost the '+' to force-push to the temporary branch, resulting in merges failing once the temporary branch wasn't in the right state any more. Fixed. Change-Id: I05d779a524c09ac6122e66b3cc3772b125c36e30
* Merge scripts: fix merging trunk.Torne (Richard Coles)2013-09-091-1/+7
| | | | | | | | The automerger has an older version of git that doesn't support passing a SHA1 to "git fetch". Go back to using the old method when merging trunk, since it's not necessary to fetch a specific SHA1 in this case. Change-Id: I4e0b7f4e671f63135c829afa0ebff320ad202b8b
* Merge scripts: support merging from Chromium releases.Torne (Richard Coles)2013-09-092-75/+118
| | | | | | | Add support for merging from Chromium releases as well as from trunk. Bug: 10152587 Change-Id: I34ed760d005c7e8c60d46a1ce36fa0167ae0c2fe (cherry picked from commit 94addffe055d2df297d4cf6c981d13a6e0a62bbc)
* WebView Automerger - don't try to merge googleurl anymore.Ben Murdoch2013-08-121-1/+0
| | | | | | | the googleurl project is now part of the main chromium project and not pulled via DEPS anymore. Remove it from the merge script. Change-Id: I984e338f7e3c60eacb59baf810e7ce688b46ea21 (cherry picked from commit 1877218f76a9fd423566d653593083bc9ea8fd13)
* Merge scripts: allow merging to non-master branches.Torne (Richard Coles)2013-08-071-20/+26
| | | | | | | | Add a --target parameter to merge_to_master.py to allow merging code from master-chromium to any target branch which was branched from master (such as a -dev branch). Change-Id: I4d318d1d9650489b2abe2faf7076675fd01a90d8
* Merge scripts: actually print the generated review details.Torne (Richard Coles)2013-08-051-1/+1
| | | | | | | | The push in frameworks/webview outputs the review URL from Rietveld; spit this output out as "info" so that it's actually displayed; debug logging is invisible by default. Change-Id: I6024797f35ead734c2ad8f24724603ffb27c7cbf
* Automerger: generate makefiles before checking licenses.Torne (Richard Coles)2013-08-051-5/+11
| | | | | | | | | When an upstream third_party directory is removed, it may still exist in our downstream checkout because of previously generated makefiles, breaking the license checks. Fix this by splitting the license check into a separate step, and doing it after makefile regeneration. Change-Id: I871c22eda5954cdb643cac5b35783192ed61d3a7
* Merge scripts: automate more of merge_to_master.Torne (Richard Coles)2013-07-311-3/+55
| | | | | | | | | | | | Allow merge_to_master.py to be given the path to a repo.prop file (from the build system). This will be used to detect the revision of chromium to merge automatically, and will also be used to create and upload a merge CL for review for frameworks/webview. Also, update all the remotes explictly when running the script to remove the need to sync both master and master-chromium first; you can now just run the script on a master-chromium checkout. Change-Id: Ie812bac3f23864dde64ceebedb443e7afbe0571f
* Merge new libjingle repo.Torne (Richard Coles)2013-07-311-0/+1
| | | | | | Chromium rearranged the libjingle checkout; start merging the new one. Change-Id: Ie86f6514b6448177361d257a0d98d9833e2575d7
* Remove libjingle from the project list.Torne (Richard Coles)2013-07-311-1/+0
| | | | | | | libjingle has moved upstream; stop merging it for now until we've created the new project (or removed this dependency). This reverts commit a20a107b5f4470d7fe1a483a493729220e8ba216.
* Revert "Fix Automerger"Torne (Richard Coles)2013-07-301-0/+1
| | | | | | This reverts commit 9f110615014e3a578fab6b60c2f24e16e5a8866a. Change-Id: I7d15a4c31fa80af0ecab80bd270a15d63b51258d
* Fix AutomergerSelim Gurun2013-07-291-1/+0
| | | | | | | Fixing automerger problem that was created due to https://codereview.chromium.org/21020006 Change-Id: Iea40d2420ae5576d75569fb02a928bb44494845c
* Remove v8-i18n from project list.Torne (Richard Coles)2013-07-241-1/+0
| | | | | | This project is no longer required/used upstream. Change-Id: I9efe87507b6a9f33c2ec4b0de9a9fed36a45845e
* Adding memreport.py for postprocessing memdump output on WebView.Primiano Tucci2013-07-161-0/+135
| | | | | | | | This is a fork of upstream chromium's memreport.py (see go/memdump) customized for analyzing memory performances of both classic and chromium WebView. Change-Id: I3f12d0311972d9a9931e87929f068672ec2ce081
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 17:26:38 +0000