This reverts commit dbecad0d008bd8ef3169b241c20e688dce0c0223.
Change-Id: I032d41a62c0a0072bab3383404604d1ea572b7cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2375690
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802642}
GitOrigin-RevId: 3c1ba31cf20fd902cc8482710e67c6b5bede30c8
As one of the first steps in making the build work with Python 3,
we will need a way to indicate which actions still require Python 2
to run (most work fine under Python 3 already, but some do not).
This CL introduces a python2_action() template, which works just
like a regular action() rule, but ensures that the script runs
under Python 2 instead of whichever Python version you happen to be
running.
This CL also switches //tools/metrics:histograms_xml to use it
(because it seems to need it) as a proof that it works correctly
and does not regress in a normal (python 2) build.
Bug: 941669, 1118214
Change-Id: I98fbc073cf9443acece3caaae2ed35f9d60c38e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363655
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799909}
GitOrigin-RevId: bfd2cd563d440d8fb3136fe08b84581d968318cf
See:
https://bugs.chromium.org/p/chromium/issues/detail?id=946475#c48
I believe the root cause of the flake is trying to test if the server
has been killed by trying to rebind to the port, although my test shows
that the port can get claimed for something else by the system.
Add a process.wait() to ensure server process has terminated and remove
the error from checking the port status. Could do a check on PID status
but system could reassign the PID, so that could lead to the same
flake as before except based on PID instead of port number.
Bug: 946475
Change-Id: I48911fffcab6b592ddf627e5999fc0609e0f0b52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339553
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: David Benjamin <davidben@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799803}
GitOrigin-RevId: 21db61205360d121b6791a6f51ccf9666e899225
Check final_android_sdk instead of public_android_sdk when deciding how
to set the APK versionCode. This is a no-op for upstream as they are
always the same, but for downstream builds means that we will only add
the +50 offset when we're building against a preview SDK, instead of
also adding it when we're building with a final-but-not-yet-upstreamed
SDK.
Bug: 1025990
Change-Id: Ife01462fa3f214760e88f498e33fca2c3d1c5c58
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2300265
Reviewed-by: Ben Mason <benmason@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788731}
GitOrigin-RevId: a4637a8642625a4c450790934ce40f535b4d576d
In the GN generate_wrapper() template, it turns out there is
an ambiguity with the @WrappedPath() syntax: if you pass in
something (say, @WrappedPath(./foo)) that ends up resolving to
the current directory, it's unclear if the resolved path should be
'./foo' or 'foo'. The prior code would resolve it to 'foo', but
that causes a problem for scripts like test_env.py that want to
invoke the path as an executable; passing the result to something
like os.Popen() will cause the interpreter to search $PATH for
'foo', rather than invoking './foo' directly, and if '.' isn't in
PATH, you get an error as a result.
This CL changes the logic to return './foo' instead; hopefully
there are no cases where the value needs to be 'foo'. If there are;
we'll need to adopt a different approach.
Change-Id: I4905eba1280ed39e79140a6a850ef8139279dfdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2264931
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783670}
GitOrigin-RevId: ef048c0d1b29619e5f526744357a7525e95e3b30
In build/util/version.gni, `public_android_sdk` is used when
`target_os == "android"`.
But in build/config/android/config.gni, it's defined only when
`is_android || is_chromeos`.
This PR fixes `public_android_sdk` not defined error when
`target_os == "android"` and host toolchain (linux) used.
Change-Id: I41f75ac629ea5009a5e1e404918d256be0cbe77d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2096799
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Richard He <linyhe@microsoft.com>
Cr-Original-Commit-Position: refs/heads/master@{#749155}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b8a153c75c36cb82c953232aef42d94b4c22dc51
`gn format` recently changed its formatting behavior
for deps, source, and a few other elements when they
are assigned (with =) single-element lists to be consistent
with the formatting of updates (with +=) with single-element.
Now that we've rolled in a GN binary with the change,
reformat all files so that people don't get presubmit
warnings due to this.
This CL was uploaded by git cl split.
R=tikuta@chromium.org
Bug: 1041419
Change-Id: I15bd43c6df0ba87f879e5226e4dbb1af7ba73f03
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998745
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#731078}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4782d7368c37ae35cf0c44456ba8307079a4d24e
This change adds a pure 32-bit version of Monochrome, Trichrome and
Webview to the 64-bit build configuration. Building these targets
generates a product equivalent to building the targets on a 32-bit
config. However, by adding these, we have the option of building all
Monochrome and Trichrome products on a single 64-bit builder, and, we
share the compilation work (as opposed to the obsolete process of "APK
merging" parts from a 32-bit build into 64-bit products).
The targets added here are the public versions.
This change was originally reverted, because it exacerbated an unknown
dependency problem with Trichrome, causing problems on trybots. That
issue was fixed separately, meaning that these changes should be able to
re-land safely:
Revert: 8faa5fc4d792050ff8ed0c4f41169b753424d45b
Trichrome fix: d2a178956c8608e4c58514bf28ef2bca51f2384f
It is being relanded with a follow-on change (that was also reverted),
updated to handle WebView bundles:
a2897b6bb22d8e3d7f9a1d8797fea3f30e4e1bb5
Also added to this version is coverage of the new webview bundles.
TBR'ing torne and agrieve as they've already reviewed the original
changes.
TBR=torne@chromium.org, agrieve@chromium.org
Bug: 1027573
Change-Id: Ie1c9f042a7046505b081bfb9312e48ee8ee3b197
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960575
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1985527
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#728525}
Cr-Original-Original-Commit-Position: refs/heads/master@{#723897}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 83e35a4ebee3f28ae0a6bf0ed9f44bc8c6516250
This reverts commit a2897b6bb22d8e3d7f9a1d8797fea3f30e4e1bb5.
Reason for revert: Seems to have caused flakiness on tryjob builders:
https://ci.chromium.org/p/chromium/builders/try/android_compile_x64_dbg
Original change's description:
> Webview: Add a pure 32-bit Webview target on 64-bit configs
>
> This should have been added along with Monochrome32 and Trichrome32.
> The intent is to be able to build anything that used to use APK merging,
> on a 64-bit build config. Adding this target should make this possible.
>
> Bug: 1027573
> Change-Id: I43da067abed0fec524841faf9cb086d22a1c71ad
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1964534
> Commit-Queue: Christopher Grant <cjgrant@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Richard Coles <torne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#724602}
TBR=torne@chromium.org,cjgrant@chromium.org,agrieve@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 1027573
Change-Id: I1b1ca573e39ef7c59df5992559efe47d9782e794
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1971759
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#725761}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 6f1d008514834d98f54e4142b74f3a9e4f0ebb4e
This should have been added along with Monochrome32 and Trichrome32.
The intent is to be able to build anything that used to use APK merging,
on a 64-bit build config. Adding this target should make this possible.
Bug: 1027573
Change-Id: I43da067abed0fec524841faf9cb086d22a1c71ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1964534
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#724602}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a2897b6bb22d8e3d7f9a1d8797fea3f30e4e1bb5
Historically, the package was the last digit, and supported ABIs were
the second-last. This prioritizes supported ABIs over package, which
isn't what we really want. Any Monochrome build should have a higher
version number than any Chrome build, for example. This change reverses
the digits.
Additionally, the Monochrome and Trichrome have 4 ABI varitions,
compared to Chrome and ChromeModern's 2 variations. They are:
pure 32: 0
32 + 64-bit webview: 3
64 + 32-bit webview: 4
pure 64 (future): 5
This CL makes Chrome and ChromeModern's pure-64 bit ARCH bits match
Monochrome and Trichrome's, with a new value of 5.
Bug: 1032228
Change-Id: I9ca6e58eba38a467d779fa2a8a554534caae9779
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940947
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#723085}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 67798d13328d6d64212e80859701c9538e4ae97b
Now that all targets are explicit about their ABI requirements, a bunch
of tolerance can be removed from the build configs. This simplifies the
files, as well as reduces the risk of configs not doing what they
should.
Bug: 1027573
Change-Id: I3ea03a72e52a86d2a3de822215b505b618a50f2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940303
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#722029}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ac6d3f8790b2ee78a905ec7d78f912bc0c5396cf
This change should be a no-op in terms of build output, and has been
tested by diffing APK/AAB output (other than a correction in
Trichrome6432, a currently unused config).
The change prepares to support 32-bit only Monochrome and Trichrome
configs on 64-bit build configurations. The following is happening here:
- Support all four version number variations.
- Make any target that builds on both 32 and 64-bit explicit about it's
configuration. Eg. "monochrome" on 64-bit implies a 32-bit browser,
with a 64-bit Webview companion library.
- Refactor logic for readability.
Bug: 1027573
Change-Id: Ia37a9011717e7c2269cc9b87e817e1e9fd6ef888
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940355
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#721809}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 581a4f1fc4ec4f978192daf137ab4c10965cc730
This allows downstream embedders to specify their own branding files
and locations without having to patch chromium source files.
Change-Id: I8b5c1d71a11998ef68b586f11326d82aced35529
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1932781
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Yngve Pettersen <yngve@vivaldi.com>
Cr-Original-Commit-Position: refs/heads/master@{#721428}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0367e359d7ef617196719e348e2a238c408f6d42
This is an unchanged reland of 0c8f086794b4d8183f1094b2a43b0c9fbd41286d.
See the associated bug for reasons why this work is happening.
Refactor the version number generator script to be more explicit, and do
away with the hack that was in place to support multiple version numbers
in 64-bit config.
Also, add the new pure 32-bit Mono and Trichrome numbers, as well as an
alias 32_64 version number, which is equivalent to the ambiguous
"Monochrome" version.
TBR=agrieve@chromium.org
Bug: 1027573
Change-Id: Ib1d32b02c9db6e57eba49fba602486503071fce6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1936890
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#719274}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 00f38f073893548c377fe81bc27e19516458e8a2
This reverts commit 0c8f086794b4d8183f1094b2a43b0c9fbd41286d.
Reason for revert: https://ci.chromium.org/p/chrome/builders/ci/arm-unpublished-builder-rel/15653
TBR=agrieve
Bug: 1027573
Original change's description:
> Android: Support pure-32-bit version codes on 64-bit build configs
>
> See the associated bug for reasons why this work is happening.
>
> Refactor the version number generator script to be more explicit, and do
> away with the hack that was in place to support multiple version numbers
> in 64-bit config.
>
> Also, add the new pure 32-bit Mono and Trichrome numbers, as well as an
> alias 32_64 version number, which is equivalent to the ambiguous
> "Monochrome" version.
>
> Bug: 1027573
> Change-Id: Iae270f84ad3cf3c28e9001460a016aa7f75237e8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1931100
> Commit-Queue: Christopher Grant <cjgrant@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#718671}
TBR=cjgrant@chromium.org,agrieve@chromium.org
Change-Id: Ic5874955be3e1c723635accb5f9381540f3d6b34
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1027573
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1934428
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#718684}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 45b08193d4fbaeae3d7a40d1bf78f3bc258cadbc
See the associated bug for reasons why this work is happening.
Refactor the version number generator script to be more explicit, and do
away with the hack that was in place to support multiple version numbers
in 64-bit config.
Also, add the new pure 32-bit Mono and Trichrome numbers, as well as an
alias 32_64 version number, which is equivalent to the ambiguous
"Monochrome" version.
Bug: 1027573
Change-Id: Iae270f84ad3cf3c28e9001460a016aa7f75237e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1931100
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#718671}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0c8f086794b4d8183f1094b2a43b0c9fbd41286d
These will be required in order to use Trichrome in the 64/32
configuration.
Bug: 1010749
Change-Id: I9ba165b13a5ad8034496b5795a53de35847e3786
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1834847
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Auto-Submit: Peter Collingbourne <pcc@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#709348}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b93b4b5c50f03bb658b1f1109fbaad8ac259e097
Converts run_benchmark to use the newer generate_wrapper() template.
Deletes other uses, which I don't think were used at all.
This also adds a call to "normpath" to generate_wrapper.py so that
@WrappedPath()s don't look odd (e.g.: one was: "bin/../.")
Bug: 816629
Change-Id: I5aa5dc7c2033e3386712f7162fe7371dc47661fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866556
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#707092}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 148d5c929660651d8110e6d7773081335d188d7d
https://chromium-review.googlesource.com/c/chromium/src/+/1756947 made it
so that chrome/BUILD.gn is loaded with the host toolchain. chrome/BUILD.gn
used to reference chrome_dylib_version if is_mac, but build/util/version.gni
only defined chrome_dylib_version if target_os == "mac". This makes the
files use the same conditional.
Bug: 495204
Change-Id: I4f51efb33e3055f7bf627a57fc7c69a67db12fc1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1804134
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#696581}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 215dccbd309ce1c7d39a6a62bb7cf7eef58dde64
Fixes include:
- Using the system python when trying to invoke a python script.
- Don't run the test via swarming on mac since there's no mac VMs
available in chrome-swarming's test pool.
Bug: 961548
Change-Id: Idad126d8b90ea77d772fc239d55f799864127eb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1654268
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#668424}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 26f769b13548ea2a4322b48035b872b359676d2d
The sync test server was deleted in 088b19ea.
Bug: 406545
Change-Id: I403d50812b4b1d6c97579fc46ae85ca4495fabcd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1612761
Commit-Queue: Eric Roman <eroman@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#660105}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 6ce7c7040e68d6d6119b81c1bc7e3f2048c141cc
The copy in third_party is unused, as .vypthon is already pulling in version 0.7 used by the test server.
TBR: rogerta@chromium.org,skyostil@chromium.org,raymes@chromium.org
Change-Id: I417a3c3ac581b5b9cfe37d23bbc1ada6515730ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1611621
Commit-Queue: Eric Roman <eroman@chromium.org>
Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Roger Tawa <rogerta@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#660057}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c7fe4edac368fee13877491c527456d1f79f76ed
_RunGitCommand build/util/lastchange.py uses the default ascii
decoder for parsing git command output. This CL uses 'utf_8'
instead. The following phrase has non-ascii characters: Même
français va marcher maintenant!
Bug: 960256, 941669
TBR: dpranke@chromium.org,raul@tambre.ee
Change-Id: I83c9839be8844710a64e3ce870d4c2a453462522
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1598789
Reviewed-by: Matthew Cary <mattcary@chromium.org>
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#657173}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b4a328826b3b412cbee511f8c7e8b5fb9c08d7eb
This reverts commit a7c30991dbdbb066818b9a25b8421c500508e922.
Reason for revert: This broke the build because someone with the name "Möller" commited something. It probably has to be changed to decode(enconding="utf-8") but I will revert this first.
Original change's description:
> //build/util/lastchange.py: Decode Git output for Python 3 support
>
> The script still works with Python 2.
> There are no intended behaviour changes.
>
> Bug: 941669
> Change-Id: Ie6d821ae4d6333fadd339d6466778e705a4d7c97
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1591609
> Auto-Submit: Raul Tambre <raul@tambre.ee>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Raul Tambre <raul@tambre.ee>
> Cr-Commit-Position: refs/heads/master@{#657140}
TBR=dpranke@chromium.org,raul@tambre.ee
Change-Id: I0e202c22d83b63d0ef6557514f72394ceb75c8a5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 941669
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1598808
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#657156}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0d359b321c0e40032edf71c9f7bf42a26bec03ee
version_codes.txt, generated by official_buildbot script, is using the wrong
label for webview version codes. Label is currently WebviewStable, etc, but
these need to match the APK names, ie AndroidWebviewStable etc.
This is the final of a multi-part patch.
Previous CLs: crrev/i/1221430, crrev/c/1586394, crrev/i/1220601
Bug: 957163
Test: Run official_buildbot.sh locally and check that version_codes.txt
Test: has appropriate version code values for AndroidWebview apks
Change-Id: Ifb5f0b979cdbfb3f702055c896eccb057cffeb2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1585656
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#655023}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8fc9ec734ca7b96b6b44e10f19e445e3b4000a2e
version_codes.txt, generated by official_buildbot script, is using the wrong
label for webview version codes. Label is currently WebviewStable, etc, but
these need to match the APK names, ie AndroidWebviewStable etc.
This was intended to be the second of a 3-way patch, but some of the
changes needed downstream were missed, and so two more patches remain:
one downstream to implement this new change and another upstream to
remove old unneeded values.
Previous cl: crrev/i/1220601
Bug: 957163
Test: Run official_buildbot.sh locally and check that version_codes.txt
Test: has appropriate version code values for AndroidWebview apks
Change-Id: Iffcf36aff98fd870a9f7ee54ebc7a033e728b46c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1586394
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#654942}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7ab57366f5cbcaba7d8b7d76297559a06a53e14f
Change the characters that get written to the chrome_versions.txt output
file so that it can be read by the parser Omaha uses.
Bug: 953059
Change-Id: I219dd2360cacf6d9bed2316478d86e733c4dcb06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1570699
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#651786}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 683a70218f4b3a33ddb2eb8560488a4343a293db
Change the characters that get written to the chrome_versions.txt output
file so that it can be read by the parser Omaha uses.
Bug: 953059
Change-Id: Id36ac48cdce1686cf0509e7b5fb175b3b2baebb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1568009
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#651365}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c4c3c4933642d234a7dfccd9df28c783439b285e
This is one of multiple follow-ups to crrev.com/c/1554184.
That CL accidentally left mb looking for a runtime_deps file that
the generate_wrapper template wasn't generating. This CL simplifies
it to just use the default runtime_deps file for actions.
Bug: 816629,861983
Change-Id: Idfd208d32a4e8b3a66af30e8d9a307f1a8bd3b8c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1562214
Auto-Submit: John Budorick <jbudorick@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#650106}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 39f14962238cb6e30faa8fd76ba731a3192e6cd7
This reverts commit b4a06a456edebd47cdc421e752adb6b6e333f422.
Reason for revert: Clank Official Build Failure - 75.0.3761.0 crbug.com/951364
Original change's description:
> [Bundles] Add Upstream 64-bit Trichrome Chrome Bundles.
>
> This CL adds the following targets for 64-bit biulds:
> trichrome_64_32_chrome_bundle
> trichrome_64_chrome_bundle
>
> These complemnent existing Monochrome targets.
>
> Also rename template monochrome_public_bundle_tmpl to
> monochrome_or_trichrome_public_bundle_tmpl.
>
> Change-Id: I1773085c82e2dbf068c9bfbd1ca03a7175fee1c8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1553913
> Reviewed-by: Christopher Grant <cjgrant@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
> Commit-Queue: Samuel Huang <huangs@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#648671}
TBR=huangs@chromium.org,cjgrant@chromium.org,agrieve@chromium.org,tiborg@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: Ifce48fc21989590f7bdcdc5c1337653cf1d9a7cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1561272
Reviewed-by: Xi Han <hanxi@chromium.org>
Commit-Queue: Xi Han <hanxi@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#649513}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a4352cd27f4b62b0668d07e84ac74093a80f45a2
This CL adds the following targets for 64-bit biulds:
trichrome_64_32_chrome_bundle
trichrome_64_chrome_bundle
These complemnent existing Monochrome targets.
Also rename template monochrome_public_bundle_tmpl to
monochrome_or_trichrome_public_bundle_tmpl.
Change-Id: I1773085c82e2dbf068c9bfbd1ca03a7175fee1c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1553913
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#648671}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b4a06a456edebd47cdc421e752adb6b6e333f422
Channel-specific versionCodes for standalone webview need to be in a
specific order so the correct channels have precedence over others.
Follow-up CL to http://crrev/c/1547757
Bug: 919216
Change-Id: I085ee25dc4029cf3edb3b3f5b0d2257267adc800
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1550011
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#647130}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3cc32db7d1e493d305f7fedd331819b3cd1be251
To enable downstream official build scripts to build channels for
standalone webview, upstream version code logic needs to generate
unique version codes for each channel.
Change-Id: Ic53d4c529416ded7bf32498c527d623f17b2f478
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547757
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Reviewed-by: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#646941}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 909e9085881a7e9a8b6cfc9fb157a6a863beb064
Android arm64 builds of monochrome need to build multiple apks with
various combinations of 32-vs-64-bit chrome & webview. Each apk will
need a unique version code, distinguished by the second-to-last digit
(the architecture digit).
This CL modifies the version code logic to support this.
Bug: 946281
Test: Check chrome_versions.txt, add automated tests.
Change-Id: I78b8d6fedb4c18db2442f50a027f988616e180c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1540683
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#646640}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: de15424b71aedb6209ca127952c2d87d20a0da74
Write android chrome versionCode values to a file in version.gni,
making the values accessible elsewhere, such as in downstream build
scripts.
Also add support for notouch build versionCodes, to enable removing
downstream versionCode logic entirely.
Depends on: http://crrev/c/1501459
Bug: 919636
Test: Run android chrome official build script successfully
Change-Id: I4a85f01c302346a46b184b9d15a5d7a89c273d83
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1524096
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#645144}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: e9f8b8674e5c76e91c65d1be3eb6cb2a3b245510
Refactor existing chrome for android and webview version code
logic from build/config/android/chrome_version.gni to a python
script and add unit tests (in PRESUBMIT).
Bug: 938138, 945039
Test: Add unit tests in PRESUBMIT; manually verify versionCode
Test: values in manifest.xml using Android Studio apk analyzer
Change-Id: I6537c8f2d4d1f6ee9a18c43f253b69de0afe674a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1501459
Commit-Queue: Drew Stonebraker <stonebraker@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#645096}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c14bba7555f72753930dcbd93bc3f59acb291728
Reland commit f4f6c5fff0620889d1ba8f0f319d15cb21510dfb
Revert 1 was 172ccc05351f0786dab62149f35ac75241d66878
Revert 2 was cd0e1d01615241e4e01a8510ab3f342666cdff6f
The previous attempt at a reland failed during gclient sync
when lastchange.py attempted to perform
"git log -1 --format=%H %ct --grep=^Change-Id: HEAD"
The new logic shows the git failure but falls back to
the original logic of defaulting to a version of 0.0.0
when the git command fails.
Bug: 917159
Change-Id: I22a03fe773a3507e566abb9d29eac08d7e56a647
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1533261
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Eli Ribble <eliribble@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#644680}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 75221bfc31b61c340bd6663d82fd9dabe973c394
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
Ben Mason
Dirk Pranke
Ben Joyce
Josip Sokcevic
Torne (Richard Coles)
Richard He
Nico Weber
Christopher Grant
Yngve N. Pettersen
Peter Collingbourne
Andrew Grieve
Raul Tambre
Ben Pastene
Eric Roman
Matthew Cary
Christian Dullweber
Drew Stonebraker
John Budorick
Samuel Huang
Xi Han
Eli Ribble