Граф коммитов

88 Коммитов

Автор SHA1 Сообщение Дата
Raul Tambre e625c0fa04 Improve Python 3 support in build scripts
The changes are to allow build files to be generated using Python 3 on Windows.

The scripts still work with Python 2.
There are no intended behaviour changes.

Bug: 941669
Change-Id: I52c912c624660c7a46c05f8f36871744abd7b8d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1521487
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Raul Tambre <raul@tambre.ee>
Cr-Original-Commit-Position: refs/heads/master@{#641870}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4197d3af6e42aa72076d6051153a644f3df62dd5
2019-03-19 15:04:20 +00:00
Kevin Marshall ebd384ac00 Roll Fuchsia SDK from a2ea5f5d6d67 to d5a51eb15454dffbf068
Clobber build output to work around bad Ninja deps cache due to deps
refactoring.

The AutoRoll server is located here: https://autoroll.skia.org/r/fuchsia-sdk-chromium-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia-arm64-cast;luci.chromium.try:fuchsia-x64-cast
TBR=cr-fuchsia+bot@chromium.org

Bug: 934404
Change-Id: I87edf0347fbbf18adc2adee7a18f1f3078c3e6e6
Reviewed-on: https://chromium-review.googlesource.com/c/1481078
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#635005}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: f428272910b363cefbf67f9bebedbd32fcd29705
2019-02-25 01:42:42 +00:00
Blink Reformat 6ae4520a1a The Great Blink mv for source files, part 2.
Move and rename files.

NOAUTOREVERT=true
NOPRESUBMIT=true
NOTREECHECKS=true
Bug: 768828
TBR=darin@chromium.org
NOTRY=true

Change-Id: I66d3b155808bc5bdbf237b80208e1e552bcf7f28
Reviewed-on: https://chromium-review.googlesource.com/1001153
Reviewed-by: Blink Reformat <blink-reformat@chromium.org>
Commit-Queue: Blink Reformat <blink-reformat@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#549061}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0aee4434a4dba42a42abaea9bfbc0cd196a63bc1
2018-04-07 15:32:37 +00:00
Michael Achenbach 3a79ba16d4 [build] Simplify landmines and strip off gyp-dependent options
This prepares removing the option to make landmines target-platform
dependent, as this depends on gyp environment variables.

Instead we'll be able to only depend on host_os.

This will cause clobber on all Android builds, as Android-specific
landmines will no longer be supported.

In follow-ups, we'll remove use of landmine_utils.platform() in other
client projects and then remove the definition here.

Bug: 756691
Change-Id: I08c1f4ecd05f5f4331bf1ab9eedda22419af2942
Reviewed-on: https://chromium-review.googlesource.com/924114
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#537436}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d76f98f52683e21606b35d15b156e28a72cb85f4
2018-02-16 22:40:01 +00:00
Paul Miller ea0725cd09 Roll GMS to 11.2.0 a.k.a. v12_1
- Add the vision-common client, since the vision client has been split
  into vision and vision-common.
- Add a landmine, since GN can't deal with reversing the dependency
  between google_play_services_vision_common_java and
  google_play_services_vision_java.
- Add the basement client's Proguard config to all the other clients,
  since common Proguard flags are now consolidated in basement, rather
  than being duplicated for all clients.
- Update the cached .info files, as is required since
  cf7f522954566498f01a4809932319b720e57338.
- Make InstanceIdWithSubtype contain rather than extend InstanceID. The
  InstanceID constructor which takes a subtype is now private; iid
  instead exposes a getInstance which takes the subtype via Bundle.

BUG=706943

Change-Id: I16ba37243eb7a5b49539fefe489986fcd3f8ffb0
Reviewed-on: https://chromium-review.googlesource.com/729047
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Commit-Queue: Paul Miller <paulmiller@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#510877}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3a7fff53a24d265afd73b181d0771a8c5046480a
2017-10-23 19:48:24 +00:00
brucedawson 259d8497c4 Add comment warning about modifying landmines
Modifying landmines has greater consequences than is sometimes realized
for developers, especially on Windows. Add a comment to warn editors of
these consequences.

R=dpranke@chromium.org
BUG=736939

Review-Url: https://codereview.chromium.org/2960013002
Cr-Original-Commit-Position: refs/heads/master@{#483579}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a1ed2e02283cf828822dd24dd0e8f5e22767b4bc
2017-06-30 01:25:11 +00:00
Andrii Shyshkalov e032adca54 Landmine to ensure GN roll revert has effect everywhere.
TBR=machenbach@chromium.org

Bug: 736215
Change-Id: I30b49f478c8c6ba9a6507092924a6f05a5f6ea8e
No-Try: True
Reviewed-on: https://chromium-review.googlesource.com/544867
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#481841}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a84d39ad4042857ced02e1b1585b7d29aa8f6c09
2017-06-23 10:04:13 +00:00
brettw 1c401440cf Enable noexcept on Windows, use for a few move constructors.
MSVC complains if you use noexcept with no exception handling mode specified (as we do).
This code disables the warning. noexcept on move constructors allows better optimizations
in some cases.
http://en.cppreference.com/w/cpp/language/noexcept_spec

Updates a few common classes' move constructors to use this.

Reland of https://codereview.chromium.org/2771643002 with landmine. There were some
reports of PCH headers not getting updated and the warning change no taking effect.
I investigated briefly but could not see why PCH dependencies are incorrect.

Review-Url: https://codereview.chromium.org/2769283002
Cr-Original-Commit-Position: refs/heads/master@{#459455}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: f78cc27d15ccbd1fd0c5c93aa03b939cd89b9b89
2017-03-24 16:36:42 +00:00
brucedawson 957a0ba4d6 Fix VS 2015 Update 3, 14393 SDK landmine
The VS 2015 Update 3, 14393 SDK landmine currently fires if you move to
building with VS 2017. That is undesirable. For local builds it is
unnecessary. For bot builds we need to fix the long-standing bug whereby
Windows compiler changes fail to trigger builds, rather than relying on
this landmine quirk.

R=scottmg@chromium.org
BUG=683729

Review-Url: https://codereview.chromium.org/2742603002
Cr-Original-Commit-Position: refs/heads/master@{#455812}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8f32820f092fb4b91778feb1304c6161fec14658
2017-03-09 18:49:37 +00:00
Philip Jägenstedt c44568cdb8 Speculatively clobber Mac after "Switch Mac Intel GPU bots to 10.12 from 10.10"
Something in this range broke the Mac builder:
c6e4c6f1f9%5E..1a7740c44a6c4d03423c4b5ff7d746e1a1b7363e?pretty=fuller

r442828 is the most obvious candidate which may have affected builds.

BUG=679607
TBR=kbr@chromium.org

Review-Url: https://codereview.chromium.org/2626993002 .
Cr-Original-Commit-Position: refs/heads/master@{#442832}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 117c52b0a0add3b82ca354e6a2d3dd2be54abc25
2017-01-11 09:25:44 +00:00
scottmg 7b9031c801 win: Switch to 10.0.14393.0 SDK
The 10.0.14393.0 SDK was packaged at the same time as the 10.0.10586.0
SDK, during the switch to VS 2015 Update 3. The only reason the SDK
wasn't switched at the same time was to isolate the two changes from
each other, and there's no reason I am aware not to change the SDK now.

R=brucedawson@chromium.org
BUG=440500

Review-Url: https://codereview.chromium.org/2555393003
Cr-Original-Commit-Position: refs/heads/master@{#437190}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b77dd4921b8c3bd94d4543d88dfc160a85dbf868
2016-12-08 06:01:07 +00:00
gogerald 43f8b7b4f8 Refactor: move components/sync/../signin to components/signin/../
This CL also moves AndroidSyncSettings.updateAccount from ChromeSigninController to SigninManager

BUG=567975

Review-Url: https://codereview.chromium.org/2351703003
Cr-Original-Commit-Position: refs/heads/master@{#421078}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 338144c0ff454a98eed2c64cbfa24db0629b9aa7
2016-09-27 01:55:46 +00:00
brucedawson 625d00bab6 Switch to VS 2015 Update 3
VS 2015 Update 3 offers numerous improvements such as improved
language conformance, fixes to avoid linker crashes, and
improved code-gen for faster performance. Update 3 also resolves
some problems with incremental linking silently falling back to
a full link.

It also fixes an internal compiler error in /analyze builds.

The landmines change is needed because otherwise things like the
out\Release\cdb directory do not get regenerated.

The process for creating this package is:
- Create a clean Windows VM running Windows Server 2012 R2 (en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso, SHA1: 247EAEE5628850A41F0C51471656AAFB2492EA08, Standard Edition)
- Install depot tools, run ‘gclient’, and add depot_tools to the path
- Install VS 2015 Professional Update 3 - must have been installed after July 12th to get the latest fixes - with these settings and nothing else:
 * Visual C++ and make sure the three nodes underneath are also selected
 * Under Universal Windows App Development Tools make sure the "Tools (1.4.1) and Windows 10 SDK (10.0.14393)" and the "Windows 10 SDK (10.0.10586)" nodes are selected and nothing else
- Copy the *Debugger and Tools*.msi installers from another machine and run them. The 10.0.14393 versions (Anniversary Edition) should be used.
- Then run:
    python depot_tools\win_toolchain\package_from_installed.py 2015

It is also possible to package the 14393 SDK by running this command,
but that change is being saved for later:
    python depot_tools\win_toolchain\package_from_installed.py 2015 -w 10.0.14393.0

BUG=627216,636468,427616,637456

Review-Url: https://codereview.chromium.org/2106203002
Cr-Original-Commit-Position: refs/heads/master@{#417157}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 02343c661ee0482cb73ad0cf861999f2c57eeb11
2016-09-08 01:54:27 +00:00
thakis 1054b60d5e Remove more unused landmines code
Follow-up to https://codereview.chromium.org/2071463002/

BUG=none

Review-Url: https://codereview.chromium.org/2193023003
Cr-Original-Commit-Position: refs/heads/master@{#408871}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8205ee9cf8ad521a3c4efcbc505e53f4d53eadc6
2016-07-30 14:10:12 +00:00
thakis 0299b0e8f5 Simplify landmines code a bit now that all branches of all platforms are on ninja
BUG=none

Committed: https://crrev.com/7491d14275670fad399837445b6c1e76ff498a50
Review-Url: https://codereview.chromium.org/2071463002
Cr-Original-Commit-Position: refs/heads/master@{#408818}
Cr-Original-Original-Commit-Position: refs/heads/master@{#408739}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 08e9878eadb7ce7477f5947190d4b4c29acf2f56
2016-07-30 00:36:52 +00:00
brettw d6e7425174 Revert of Simplify landmines code a bit now that all branches of all platforms are on ninja (patchset #2 id:20001 of https://codereview.chromium.org/2071463002/ )
Reason for revert:
I just synced on Windows and this is giving me:

________ running 'D:\depot_tools\python276_bin\python.exe src/build/landmines.py
' in 'D:\src\src1'
Traceback (most recent call last):
  File "D:\src\src1\src\build\get_landmines.py", line 16, in <module>
    builder = landmine_utils.builder
AttributeError: 'module' object has no attribute 'builder'
Clobbering due to:
--- old_landmines       Tue Aug 12 16:34:51 2014
+++ new_landmines       Fri Jul 29 15:16:56 2016
@@ -1,17 +0,0 @@
-Compile on cc_unittests fails due to symbols removed in r185063.
-Improper dependency for create_nmf.py broke in r240802, fixed in r240860.
-Switch to VS2015 Update 2
-Need to clobber everything due to an IDL change in r154579 (blink)
-Need to clobber everything due to gen file moves in r175513 (Blink)
-Clobber to get rid of obselete test plugin after r248358
-Clobber to rebuild GN files for V8
-Clobber to get rid of stale generated mojom.h files
-Need to clobber everything due to build_nexe change in nacl r13424
-[chromium-dev] PSA: clobber build needed for IDR_INSPECTOR_* compil...
-blink_resources.grd changed: crbug.com/400860
-ninja dependency cycle: crbug.com/408192
-Clobber to fix missing NaCl gyp dependencies (crbug.com/427427).
-Another clobber for missing NaCl gyp deps (crbug.com/427427).
-Clobber to fix GN not picking up increased ID range (crbug.com/444902)
-Remove NaCl toolchains from the output dir (crbug.com/456902)
-Clobber to delete stale generated files (crbug.com/510086)

Original issue's description:
> Simplify landmines code a bit now that all branches of all platforms are on ninja
>
> BUG=none
>
> Committed: https://crrev.com/7491d14275670fad399837445b6c1e76ff498a50
> Cr-Commit-Position: refs/heads/master@{#408739}

TBR=iannucci@chromium.org,thakis@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Review-Url: https://codereview.chromium.org/2198583002
Cr-Original-Commit-Position: refs/heads/master@{#408784}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8a049c09cbc55b069e41eee94e63d31aa609d927
2016-07-29 22:26:40 +00:00
thakis caf94860a9 Simplify landmines code a bit now that all branches of all platforms are on ninja
BUG=none

Review-Url: https://codereview.chromium.org/2071463002
Cr-Original-Commit-Position: refs/heads/master@{#408739}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7491d14275670fad399837445b6c1e76ff498a50
2016-07-29 21:04:32 +00:00
bpastene 0e8dbbb218 Add landmine for a clobber on mac bots.
BUG=620075

Review-Url: https://codereview.chromium.org/2071663002
Cr-Original-Commit-Position: refs/heads/master@{#400226}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 9b4f062f46f88ba35707350dd8d74b027651ad7c
2016-06-16 19:28:16 +00:00
brucedawson e7edc3f267 VS 2015 Update 2 RTW (final)
This is the official VS 2015 Update 2 release. This includes all of the
bug fixes which Chromium has been depending on.

BUG=440500

Review URL: https://codereview.chromium.org/1851573002

Cr-Original-Commit-Position: refs/heads/master@{#384480}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 21d776d93f2e432995f6076045f8183c141cd335
2016-04-01 04:11:28 +00:00
brucedawson c015f66b0a New VS 2015 toolchain from 2016_03_10
BUG=440500

Review URL: https://codereview.chromium.org/1796933002

Cr-Original-Commit-Position: refs/heads/master@{#381221}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a75b523af7b2e85970875a4060b74980c1761845
2016-03-15 14:47:26 +00:00
brucedawson 68daea643a Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1778343002/ )
Reason for revert:
Preparing a revert in order to reland VS 2015. The CL is not reading for committing yet.

Original issue's description:
> Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1740583002/ )
>
> Reason for revert:
> Broke isolate tests on Win8 GN (dbg) and Win x64 GN (dbg).
>
> Original issue's description:
> > Reland of Change default Windows compiler to VS 2015
> >
> > The change to get_landmines.py is there because modifying this file
> > affects analyze behavior so that all tests run. Changing the printed
> > message is purely a side effect.
> >
> > This change also removes some redundant INCLUDE paths. These are
> > unnecessary when building with VS 2015 (because it defaults to the
> > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > problematically long).
> >
> > This change was redone in order to fix merge conflicts and because after
> > a few weeks a fresh set of approvals seems reasonable.
> >
> > The original change was landed as crrev.com/1598493004
> >
> > BUG=440500, 584782
> >
> > Committed: https://crrev.com/d4dcbd342dd54f55383daf8bc44b2c9d97fe0d0b
> > Cr-Commit-Position: refs/heads/master@{#380382}
>
> TBR=scottmg@chromium.org,dpranke@chromium.org,brucedawson@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=440500, 584782
>
> Committed: https://crrev.com/cb3f85f80a2c146e0e4bf064f02bf68acb274ce5
> Cr-Commit-Position: refs/heads/master@{#380395}

TBR=scottmg@chromium.org,dpranke@chromium.org,vasilii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=440500, 584782

Review URL: https://codereview.chromium.org/1783773004

Cr-Original-Commit-Position: refs/heads/master@{#380711}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2b33e7eee5db5f956426dbf664f68bff3fe7daee
2016-03-11 19:56:33 +00:00
vasilii 2d00025c23 Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1740583002/ )
Reason for revert:
Broke isolate tests on Win8 GN (dbg) and Win x64 GN (dbg).
https://build.chromium.org/p/chromium.win/builders/Win8%20GN%20%28dbg%29/builds/22695/steps/isolate%20tests/logs/stdio

[found] [hashed/size/to hash] [looked up/to lookup] [uploaded/size/to upload/size]
04:10:31.512494 Root: E:\b\build\slave\Win8_GN__dbg_\build\src
04:10:31.513479 Root: E:\b\build\slave\Win8_GN__dbg_\build\src

events_unittests  GetFileAttributesEx E:\b\build\slave\Win8_GN__dbg_\build\src\out\Debug\msvcp120d.dll: The system cannot find the file specified.
04:10:31.988532 PushDirectory(E:\b\build\slave\Win8_GN__dbg_\build\src\content\test\data\) = 1574 files
04:10:32.060523 PushDirectory(E:\b\build\slave\Win8_GN__dbg_\build\src\media\test\data\) = 233 files
04:10:32.435549 PushDirectory(E:\b\build\slave\Win8_GN__dbg_\build\src\net\data\) = 974 files
04:10:32.464549 PushDirectory(E:\b\build\slave\Win8_GN__dbg_\build\src\net\tools\testserver\) = 11 files
[2843] [6/29.0Mib/39] [0/6] [0/0b/0/0b] 1s
04:10:32.505555 PushDirectory(E:\b\build\slave\Win8_GN__dbg_\build\src\third_party\pyftpdlib\) = 37 files
04:10:32.539557 PushDirectory(E:\b\build\slave\Win8_GN__dbg_\build\src\third_party\pywebsocket\) = 99 files
04:10:32.578571 PushDirectory(E:\b\build\slave\Win8_GN__dbg_\build\src\third_party\tlslite\) = 105 files

content_browsertests  GetFileAttributesEx E:\b\build\slave\Win8_GN__dbg_\build\src\out\Debug\msvcp120d.dll: The system cannot find the file specified.
Hits    :     0 (0b)
Misses  :     0 (0b)
Duration: 1.301s
isolate: GetFileAttributesEx E:\b\build\slave\Win8_GN__dbg_\build\src\out\Debug\msvcp120d.dll: The system cannot find the file specified.
step returned non-zero exit code: 1

Original issue's description:
> Reland of Change default Windows compiler to VS 2015
>
> The change to get_landmines.py is there because modifying this file
> affects analyze behavior so that all tests run. Changing the printed
> message is purely a side effect.
>
> This change also removes some redundant INCLUDE paths. These are
> unnecessary when building with VS 2015 (because it defaults to the
> Windows 10 SDK) and actively harmful (they make the INCLUDE path
> problematically long).
>
> This change was redone in order to fix merge conflicts and because after
> a few weeks a fresh set of approvals seems reasonable.
>
> The original change was landed as crrev.com/1598493004
>
> BUG=440500, 584782
>
> Committed: https://crrev.com/d4dcbd342dd54f55383daf8bc44b2c9d97fe0d0b
> Cr-Commit-Position: refs/heads/master@{#380382}

TBR=scottmg@chromium.org,dpranke@chromium.org,brucedawson@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=440500, 584782

Review URL: https://codereview.chromium.org/1778343002

Cr-Original-Commit-Position: refs/heads/master@{#380395}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: cb3f85f80a2c146e0e4bf064f02bf68acb274ce5
2016-03-10 12:41:45 +00:00
brucedawson 30fe0e8246 Reland of Change default Windows compiler to VS 2015
The change to get_landmines.py is there because modifying this file
affects analyze behavior so that all tests run. Changing the printed
message is purely a side effect.

This change also removes some redundant INCLUDE paths. These are
unnecessary when building with VS 2015 (because it defaults to the
Windows 10 SDK) and actively harmful (they make the INCLUDE path
problematically long).

This change was redone in order to fix merge conflicts and because after
a few weeks a fresh set of approvals seems reasonable.

The original change was landed as crrev.com/1598493004

BUG=440500, 584782

Review URL: https://codereview.chromium.org/1740583002

Cr-Original-Commit-Position: refs/heads/master@{#380382}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d4dcbd342dd54f55383daf8bc44b2c9d97fe0d0b
2016-03-10 09:22:49 +00:00
blundell c559ac63b0 Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1676263003/ )
Reason for revert:
Speculative revert to see if it fixes the "Duplicate COMDAT" compile error; will reland if it doesn't. Googling indicates that we have fought with "Duplicate COMDAT" errors in the past as part of trying to bring in VS 2015.

This error occurred in #374346, which is a revert of #374322 due to that CL causing test failures on Linux. Note that the Windows compiler switch landed in #374324.

Here is the error in question (from https://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20x64%20Builder%20%28dbg%29&number=18343):

FAILED: C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x64 True mojo_system_impl.dll "C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /IMPLIB:mojo_system_impl.dll.lib /DLL /OUT:mojo_system_impl.dll @mojo_system_impl.dll.rsp" 2 mt.exe rc.exe "obj\third_party\mojo\mojo_system_impl.mojo_system_impl.dll.intermediate.manifest" obj\third_party\mojo\mojo_system_impl.mojo_system_impl.dll.generated.manifest
mojo_system_impl2.node_controller.obj : fatal error LNK1179: invalid or corrupt file: duplicate COMDAT '??1?$Callback@$$A6AXAEBVPortRef@ports@edk@mojo@@@Z@base@@QEAA@XZ'

Original issue's description:
> Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1680533004/ )
>
> Reason for revert:
> The GPU bot problem (a bug with swarming tests on component builds) is fixed with crrev.com/1676943002
>
> Original issue's description:
> > Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1679693002/ )
> >
> > Reason for revert:
> > This breaks GPU win debug bots (https://build.chromium.org/p/chromium.gpu/builders/Win7%20Debug%20%28NVIDIA%29/builds/36633 for example, every GPU test is crashing)
> >
> > Original issue's description:
> > > Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1678663002/ )
> > >
> > > Reason for revert:
> > > Issues that forced revert of VS 2015 as default compiler are believed to be fixed.
> > >
> > > Original issue's description:
> > > > Revert of Change default Windows compiler to VS 2015 (patchset #10 id:180001 of https://codereview.chromium.org/1598493004/ )
> > > >
> > > > Reason for revert:
> > > > Speculative for https://code.google.com/p/chromium/issues/detail?id=498544#c20 . Will reland if this doesn't help.
> > > >
> > > > Original issue's description:
> > > > > Change default Windows compiler to VS 2015
> > > > >
> > > > > The change to get_landmines.py is there because modifying this file
> > > > > affects analyze behavior so that all tests run. Changing the printed
> > > > > message is purely a side effect.
> > > > >
> > > > > This change also removes some redundant INCLUDE paths. These are
> > > > > unnecessary when building with VS 2015 (because it defaults to the
> > > > > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > > > > problematically long).
> > > > >
> > > > > BUG=440500,584782
> > > > >
> > > > > Committed: https://crrev.com/4c17ac0db59d7dbe78734950f83912ab564bd6fe
> > > > > Cr-Commit-Position: refs/heads/master@{#373955}
> > > >
> > > > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,brucedawson@chromium.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=440500,584782
> > > >
> > > > Committed: https://crrev.com/bbc766aef1bd8cb0d9546fec9abf264e7d8c1d96
> > > > Cr-Commit-Position: refs/heads/master@{#374013}
> > >
> > > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org
> > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > BUG=440500,584782
> > >
> > > Committed: https://crrev.com/20e99ecb08da22582d435c1a5bba0a5c96345da3
> > > Cr-Commit-Position: refs/heads/master@{#374058}
> >
> > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,brucedawson@chromium.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=440500,584782
> >
> > Committed: https://crrev.com/03f6b0af0a3a0127f5e939095157079659ab7cc8
> > Cr-Commit-Position: refs/heads/master@{#374062}
>
> TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,zmo@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=440500,584782
>
> Committed: https://crrev.com/36f03f2ac1f92b6f41129f013f8a808f7b9127fc
> Cr-Commit-Position: refs/heads/master@{#374324}

TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,zmo@chromium.org,brucedawson@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=440500,584782

Review URL: https://codereview.chromium.org/1680123002

Cr-Original-Commit-Position: refs/heads/master@{#374349}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b9643d8169d78b6f3fdbc43895c5e830655291d9
2016-02-09 11:18:12 +00:00
brucedawson 2db0837c2c Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1680533004/ )
Reason for revert:
The GPU bot problem (a bug with swarming tests on component builds) is fixed with crrev.com/1676943002

Original issue's description:
> Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1679693002/ )
>
> Reason for revert:
> This breaks GPU win debug bots (https://build.chromium.org/p/chromium.gpu/builders/Win7%20Debug%20%28NVIDIA%29/builds/36633 for example, every GPU test is crashing)
>
> Original issue's description:
> > Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1678663002/ )
> >
> > Reason for revert:
> > Issues that forced revert of VS 2015 as default compiler are believed to be fixed.
> >
> > Original issue's description:
> > > Revert of Change default Windows compiler to VS 2015 (patchset #10 id:180001 of https://codereview.chromium.org/1598493004/ )
> > >
> > > Reason for revert:
> > > Speculative for https://code.google.com/p/chromium/issues/detail?id=498544#c20 . Will reland if this doesn't help.
> > >
> > > Original issue's description:
> > > > Change default Windows compiler to VS 2015
> > > >
> > > > The change to get_landmines.py is there because modifying this file
> > > > affects analyze behavior so that all tests run. Changing the printed
> > > > message is purely a side effect.
> > > >
> > > > This change also removes some redundant INCLUDE paths. These are
> > > > unnecessary when building with VS 2015 (because it defaults to the
> > > > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > > > problematically long).
> > > >
> > > > BUG=440500,584782
> > > >
> > > > Committed: https://crrev.com/4c17ac0db59d7dbe78734950f83912ab564bd6fe
> > > > Cr-Commit-Position: refs/heads/master@{#373955}
> > >
> > > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,brucedawson@chromium.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=440500,584782
> > >
> > > Committed: https://crrev.com/bbc766aef1bd8cb0d9546fec9abf264e7d8c1d96
> > > Cr-Commit-Position: refs/heads/master@{#374013}
> >
> > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=440500,584782
> >
> > Committed: https://crrev.com/20e99ecb08da22582d435c1a5bba0a5c96345da3
> > Cr-Commit-Position: refs/heads/master@{#374058}
>
> TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,brucedawson@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=440500,584782
>
> Committed: https://crrev.com/03f6b0af0a3a0127f5e939095157079659ab7cc8
> Cr-Commit-Position: refs/heads/master@{#374062}

TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,zmo@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=440500,584782

Review URL: https://codereview.chromium.org/1676263003

Cr-Original-Commit-Position: refs/heads/master@{#374324}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 36f03f2ac1f92b6f41129f013f8a808f7b9127fc
2016-02-09 06:35:51 +00:00
zmo 961ac31b12 Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1679693002/ )
Reason for revert:
This breaks GPU win debug bots (https://build.chromium.org/p/chromium.gpu/builders/Win7%20Debug%20%28NVIDIA%29/builds/36633 for example, every GPU test is crashing)

Original issue's description:
> Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1678663002/ )
>
> Reason for revert:
> Issues that forced revert of VS 2015 as default compiler are believed to be fixed.
>
> Original issue's description:
> > Revert of Change default Windows compiler to VS 2015 (patchset #10 id:180001 of https://codereview.chromium.org/1598493004/ )
> >
> > Reason for revert:
> > Speculative for https://code.google.com/p/chromium/issues/detail?id=498544#c20 . Will reland if this doesn't help.
> >
> > Original issue's description:
> > > Change default Windows compiler to VS 2015
> > >
> > > The change to get_landmines.py is there because modifying this file
> > > affects analyze behavior so that all tests run. Changing the printed
> > > message is purely a side effect.
> > >
> > > This change also removes some redundant INCLUDE paths. These are
> > > unnecessary when building with VS 2015 (because it defaults to the
> > > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > > problematically long).
> > >
> > > BUG=440500,584782
> > >
> > > Committed: https://crrev.com/4c17ac0db59d7dbe78734950f83912ab564bd6fe
> > > Cr-Commit-Position: refs/heads/master@{#373955}
> >
> > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,brucedawson@chromium.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=440500,584782
> >
> > Committed: https://crrev.com/bbc766aef1bd8cb0d9546fec9abf264e7d8c1d96
> > Cr-Commit-Position: refs/heads/master@{#374013}
>
> TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=440500,584782
>
> Committed: https://crrev.com/20e99ecb08da22582d435c1a5bba0a5c96345da3
> Cr-Commit-Position: refs/heads/master@{#374058}

TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,brucedawson@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=440500,584782

Review URL: https://codereview.chromium.org/1680533004

Cr-Original-Commit-Position: refs/heads/master@{#374062}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 03f6b0af0a3a0127f5e939095157079659ab7cc8
2016-02-07 19:44:32 +00:00
brucedawson 6eb1a486bd Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1678663002/ )
Reason for revert:
Issues that forced revert of VS 2015 as default compiler are believed to be fixed.

Original issue's description:
> Revert of Change default Windows compiler to VS 2015 (patchset #10 id:180001 of https://codereview.chromium.org/1598493004/ )
>
> Reason for revert:
> Speculative for https://code.google.com/p/chromium/issues/detail?id=498544#c20 . Will reland if this doesn't help.
>
> Original issue's description:
> > Change default Windows compiler to VS 2015
> >
> > The change to get_landmines.py is there because modifying this file
> > affects analyze behavior so that all tests run. Changing the printed
> > message is purely a side effect.
> >
> > This change also removes some redundant INCLUDE paths. These are
> > unnecessary when building with VS 2015 (because it defaults to the
> > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > problematically long).
> >
> > BUG=440500,584782
> >
> > Committed: https://crrev.com/4c17ac0db59d7dbe78734950f83912ab564bd6fe
> > Cr-Commit-Position: refs/heads/master@{#373955}
>
> TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,brucedawson@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=440500,584782
>
> Committed: https://crrev.com/bbc766aef1bd8cb0d9546fec9abf264e7d8c1d96
> Cr-Commit-Position: refs/heads/master@{#374013}

TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=440500,584782

Review URL: https://codereview.chromium.org/1679693002

Cr-Original-Commit-Position: refs/heads/master@{#374058}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 20e99ecb08da22582d435c1a5bba0a5c96345da3
2016-02-07 18:18:53 +00:00
thakis 1bf6bbe58a Revert of Change default Windows compiler to VS 2015 (patchset #10 id:180001 of https://codereview.chromium.org/1598493004/ )
Reason for revert:
Speculative for https://code.google.com/p/chromium/issues/detail?id=498544#c20 . Will reland if this doesn't help.

Original issue's description:
> Change default Windows compiler to VS 2015
>
> The change to get_landmines.py is there because modifying this file
> affects analyze behavior so that all tests run. Changing the printed
> message is purely a side effect.
>
> This change also removes some redundant INCLUDE paths. These are
> unnecessary when building with VS 2015 (because it defaults to the
> Windows 10 SDK) and actively harmful (they make the INCLUDE path
> problematically long).
>
> BUG=440500,584782
>
> Committed: https://crrev.com/4c17ac0db59d7dbe78734950f83912ab564bd6fe
> Cr-Commit-Position: refs/heads/master@{#373955}

TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,brucedawson@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=440500,584782

Review URL: https://codereview.chromium.org/1678663002

Cr-Original-Commit-Position: refs/heads/master@{#374013}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: bbc766aef1bd8cb0d9546fec9abf264e7d8c1d96
2016-02-06 06:29:46 +00:00
brucedawson 30c0fafe79 Change default Windows compiler to VS 2015
The change to get_landmines.py is there because modifying this file
affects analyze behavior so that all tests run. Changing the printed
message is purely a side effect.

This change also removes some redundant INCLUDE paths. These are
unnecessary when building with VS 2015 (because it defaults to the
Windows 10 SDK) and actively harmful (they make the INCLUDE path
problematically long).

BUG=440500,584782

Review URL: https://codereview.chromium.org/1598493004

Cr-Original-Commit-Position: refs/heads/master@{#373955}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4c17ac0db59d7dbe78734950f83912ab564bd6fe
2016-02-05 23:55:12 +00:00
danakj 2639200934 Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (patchset #13 id:240001 of https://codereview.chromium.org/1465383003/ )
Reason for revert:
Android compile failing with related error: https://code.google.com/p/chromium/issues/detail?id=569991

Original issue's description:
> [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.
>
> BUG=488195
>
> Committed: https://crrev.com/06215e9286247b08ff6c958f725c6e5185c4acd1
> Cr-Commit-Position: refs/heads/master@{#365254}

TBR=tedchoc@chromium.org,yfriedman@chromium.org,agrieve@chromium.org,mef@chromium.org,thakis@chromium.org,jbudorick@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=488195

Review URL: https://codereview.chromium.org/1526183002

Cr-Original-Commit-Position: refs/heads/master@{#365309}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: eb58d9c805c50f85e4a04258523cf49e5c7cc5bb
2015-12-15 20:16:01 +00:00
jbudorick 24b478b0bd [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.
BUG=488195

Review URL: https://codereview.chromium.org/1465383003

Cr-Original-Commit-Position: refs/heads/master@{#365254}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 06215e9286247b08ff6c958f725c6e5185c4acd1
2015-12-15 15:23:36 +00:00
luqui c3e27fd223 Add landmine for libsqlite3.dylib
BUG=526208
NOTRY=true
TBR=iannucci@chromium.org

Review URL: https://codereview.chromium.org/1324943005

Cr-Original-Commit-Position: refs/heads/master@{#346796}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c3c801e12aa10d777b3fa9d058491a8fb707418f
2015-09-02 00:20:32 +00:00
pvalenzuela 3b761447ff Convert ChromeSyncShell to use ChromePublic infrastructure (try #2)
This is a re-land of the patch originally committed as part of
https://codereview.chromium.org/1282603005/. The one major change is
that a landmine has been added to clobber the Android arm64 bot as it
caused problems after the original commit.

Several test fixes are included to support this change.

Note: This CL only provides a GYP implementation (no GN). This is not a
regression from the previous state.

BUG=510211

Review URL: https://codereview.chromium.org/1305213003

Cr-Original-Commit-Position: refs/heads/master@{#345392}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a715a2f88e842329e6133390788b6d8d22bf8201
2015-08-25 18:44:52 +00:00
luqui b535c3997d Clobber to delete stale generated files.
BUG=510086
TBR=maruel@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/1237223002

Cr-Original-Commit-Position: refs/heads/master@{#338729}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7434b00218b67b75e3103a7c7c88b8ffc21085fb
2015-07-14 20:28:41 +00:00
scottmg c28c8ccc08 Prepare for VS2015 toolchain
This is not intended to change anything for current VS2013 users.

The 2015 code here will not work until a change in depot_tools side
lands. (It might not work after that either, but this is
the first step in getting a 2015 fyi bot up.)

R=dpranke@chromium.org
BUG=492774

Review URL: https://codereview.chromium.org/1163723003

Cr-Original-Commit-Position: refs/heads/master@{#332296}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 54e450611852fcf8cb120f73b381a50768212415
2015-06-02 01:16:21 +00:00
miu 5acfa65c84 [RELAND] Fixit: Factor out common base::Time* math operator overloads.
This relands https://codereview.chromium.org/1122443004 with a landmine
to clobber the iOS builds.  This is necessary because Xcode's logic for
determining that base/time/time.h changed is faulty and is preventing
modules dependent on it from being rebuilt.

Revert history: https://codereview.chromium.org/1125283003

BUG=467417,485435
TBR=stuartmorgan@chromium.org

Review URL: https://codereview.chromium.org/1131923005

Cr-Original-Commit-Position: refs/heads/master@{#329060}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ad576e7a77b87bfd0ed09b46cf9fdfacd342672b
2015-05-10 00:15:55 +00:00
thakis 4ea6676322 Add a note that landmines should not be used in general.
BUG=none

Review URL: https://codereview.chromium.org/1009603006

Cr-Original-Commit-Position: refs/heads/master@{#321824}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 37066a5a215e8c8e85958e7b1c7756b201b17c5c
2015-03-23 18:58:21 +00:00
ncbray bf313b31f5 Roll NaCl toolchain change.
This CL causes gclient runhooks to unpack the NaCl toolchain to
//native_client/toolchain.  It also causes GYP to use the toolchain from that
location rather than unpacking it into the output directory during the build.

This CL adds a landmine to reclaim ~1 GB of disk space.  Landmines are normally
used for correctness issues, in this case it is being used because an additional
1 GB of disk usage could cause random bots to fail.

BUG=456902

Review URL: https://codereview.chromium.org/921243002

Cr-Original-Commit-Position: refs/heads/master@{#316880}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4453c50a5dd04a86aa1c5e164b4760f14cac115d
2015-02-18 20:11:41 +00:00
ianwen 40f2a91bb7 Upstream Enhanced Bookmark Model (2nd Land)
This is the data layer of enhanced bookmark. There is no reason why
this class should live in private repository.

BUG=428832
Previously landed in:
https://crrev.com/691b64f43fc0a69752344e5edbbc4d8f406cf261
Reverted in: https://crrev.com/f40cb64710a333da6d554e98dfcc432cd6cf8f1f

Review URL: https://codereview.chromium.org/923653002

Cr-Original-Commit-Position: refs/heads/master@{#316085}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ec62d8d37848b12309994f10bf8457ae4fcabb8e
2015-02-12 23:37:16 +00:00
alexclarke 311deddb35 Revert of Upstream Enhanced Bookmark Model (patchset #6 id:100001 of https://codereview.chromium.org/899403002/)
Reason for revert:
This is blocking downstream and people are complaining.  I tried to land the downstream fix but there was a compile problem.

Sorry, hope you can fix the problems and re-land.

Original issue's description:
> Upstream Enhanced Bookmark Model
>
> This is the data layout of enhanced bookmark. There is no reason why
> this class should live in private repository.
>
> BUG=428832
>
> Committed: https://crrev.com/691b64f43fc0a69752344e5edbbc4d8f406cf261
> Cr-Commit-Position: refs/heads/master@{#315939}

TBR=kkimlabs@chromium.org,newt@chromium.org,cjhopman@chromium.org,ianwen@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=428832

Review URL: https://codereview.chromium.org/920043003

Cr-Original-Commit-Position: refs/heads/master@{#315976}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: f40cb64710a333da6d554e98dfcc432cd6cf8f1f
2015-02-12 14:53:06 +00:00
ianwen 53844cf3ce Upstream Enhanced Bookmark Model
This is the data layout of enhanced bookmark. There is no reason why
this class should live in private repository.

BUG=428832

Review URL: https://codereview.chromium.org/899403002

Cr-Original-Commit-Position: refs/heads/master@{#315939}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 691b64f43fc0a69752344e5edbbc4d8f406cf261
2015-02-12 06:34:36 +00:00
blundell b54e20e9ee Move //mojo/{public, edk} underneath //third_party
This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk

It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.

This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.

NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/814543006

Cr-Original-Commit-Position: refs/heads/master@{#312129}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 70fb54767b472a5edfb859e489beeeec7abdb0e4
2015-01-19 17:19:27 +00:00
amistry 511aa4d1f0 Revert of Reverting due to Android builders breakage. Subsequent fixes did not fix. (patchset #1 id:1 of https://codereview.chromium.org/843913006/)
Reason for revert:
Didn't fix the Android builders.

Original issue's description:
> Reverting due to Android builders breakage. Subsequent fixes did not fix.
>
> Revert "Use SuppressFBWarnings to suppress findbugs warnings"
>
> This reverts commit 7ff0672b2a8c73be5a0164a04bc9c53f64f4b138.
>
> Revert "Temporarily add a workaround for findbugs."
>
> This reverts commit 790b64ba7f5343b6b99c97e8deaa635e1e9422d0.
>
> Revert "Temporarily remove some findbugs "known bugs""
>
> This reverts commit 5a1c59272e7fd23116bcec8b952474e62bdcf7d3.
>
> NOTRY=true
> TBR=cjhopman@chromium.org
>
> Committed: https://crrev.com/710d2f69b76e7b997307a7096e31029857e8c7fb
> Cr-Commit-Position: refs/heads/master@{#311630}

TBR=cjhopman@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/827123006

Cr-Original-Commit-Position: refs/heads/master@{#311640}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 1ed4075728f265ed930531b4ba97c937068d921a
2015-01-15 07:10:54 +00:00
amistry 72eca2b361 Reverting due to Android builders breakage. Subsequent fixes did not fix.
Revert "Use SuppressFBWarnings to suppress findbugs warnings"

This reverts commit 7ff0672b2a8c73be5a0164a04bc9c53f64f4b138.

Revert "Temporarily add a workaround for findbugs."

This reverts commit 790b64ba7f5343b6b99c97e8deaa635e1e9422d0.

Revert "Temporarily remove some findbugs "known bugs""

This reverts commit 5a1c59272e7fd23116bcec8b952474e62bdcf7d3.

NOTRY=true
TBR=cjhopman@chromium.org

Review URL: https://codereview.chromium.org/843913006

Cr-Original-Commit-Position: refs/heads/master@{#311630}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 710d2f69b76e7b997307a7096e31029857e8c7fb
2015-01-15 05:50:53 +00:00
cjhopman b5e3b05b75 Use SuppressFBWarnings to suppress findbugs warnings
This has several benefits:
Makes the warning obvious at the place of the problem
Makes suppressing the warnings the same as suppressing compiler and lint warnings
Makes supporting findbugs as part of the build easier

TBR=rmcilroy, mef, boliu

BUG=431826

Committed: https://crrev.com/e0237aaa82e64439e6186f7723d4b8ceff308b9d
Cr-Commit-Position: refs/heads/master@{#311402}

Review URL: https://codereview.chromium.org/793203002

Cr-Original-Commit-Position: refs/heads/master@{#311596}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7ff0672b2a8c73be5a0164a04bc9c53f64f4b138
2015-01-15 01:01:10 +00:00
Daniel Cheng 3091c5e4e3 Add a landmine to clobber broken GN bots.
GN bots are having trouble picking up the changes to the resouce ID
range, which was changed in https://codereview.chromium.org/734243003/.

BUG=444902
R=eroman@chromium.org, thakis@chromium.org

Review URL: https://codereview.chromium.org/821303002

Cr-Original-Commit-Position: refs/heads/master@{#309588}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d1a85aee41655ad2c016ffe22320f0b1d9571e15
2014-12-23 22:55:19 +00:00
dcheng 2ab691ac21 Out of line CallbackBase's copy and assignment operators.
This saved nearly 300KiB on a release build of Chrome.

BUG=436357

Review URL: https://codereview.chromium.org/760513002

Cr-Original-Commit-Position: refs/heads/master@{#305784}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: f883604e3ea3a0b9881dc5eb1e933fb66d914003
2014-11-26 05:05:21 +00:00
scottmg 8b665c00f2 Update to VS2013 Update 4, and Windows SDK 8.1
- Disable 4996 (deprecated functions in 8.1, these don't help us because we have to run on old OSs anyway)
- Simplify Bluetooth LE header hacks (these headers are buggy in 8.0 and 8.1 SDKs, but less buggy in 8.1)
- Revert attempt to centralize toolchain hashes as it didn't work well, and made it hard to roll anyway (see 400830).
- Instead of basing C4702 (unreachable code) on Pro vs. Express, check whether it's actually disabled in the xtree header
- Remove automatic calling of Express toolchain setup script. It hasn't worked well since post VS2013 RTM because of being distributed as .msp files, and the new Community edition is relatively easy to install so can subsume that usage (that being the motivation for the 4702 change above)
- goma package for u4 is pushed
- ANGLE is switched to load d3dcompiler_47 and build against 8.1 sdk, roll included here.

Xrefs:
- https://codereview.chromium.org/719343004/
- https://chromium-review.googlesource.com/#/c/229616/
- b2/18365241
- https://codereview.chromium.org/733563003/
- https://codereview.chromium.org/732673002/
- https://codereview.chromium.org/729453004/
- https://chromereviews.googleplex.com/120597013/

BUG=311488,432748,400830

Review URL: https://codereview.chromium.org/720033003

Cr-Original-Commit-Position: refs/heads/master@{#304329}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a6675a5f1f55e66b1d6625af6225d44f5d9b0f3d
2014-11-15 01:38:14 +00:00
petrcermak 9504305385 Add support to base::Timer for custom task runners.
This patch adds a public method
SetTaskRunner(scoped_refptr<SingleThreadTaskRunner>) to base::Timer
which changes the task runner used by the timer
(ThreadTaskRunnerHandler::Get() by default).

This change will enable scheduling timers on the queues of the
Blink scheduler (see https://codereview.chromium.org/637303003/).
Most importantly, we plan to apply this to the shared timer in
blink::Platform.

BUG=

Review URL: https://codereview.chromium.org/637983003

Cr-Original-Commit-Position: refs/heads/master@{#302947}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7652da6d5cbd7e5b82b340e638ebe80aafeacf6e
2014-11-06 02:18:21 +00:00
petrcermak 529efed80f Fix ninja "multiple rules" warning.
BUG=427526

Review URL: https://codereview.chromium.org/680923002

Cr-Original-Commit-Position: refs/heads/master@{#302064}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 297afd0505b111fe9ea65620fca6de4b2f16f234
2014-10-30 10:22:48 +00:00