- Decode the result of subprocess.Popen() so that the stdout/stderr
result is str, not bytes.
- Use dict.items() instead of dict.iteritems().
- If the return of map() needs to be a list, use list comprehension.
- Use range() instead of xrange().
- Tuple parameter unpacking is removed on Python3, refactor its usage.
- struct.pack() doesn't accept str, convert arguments as bytes.
- plistlib has several API changes. Replace removed.
functions (readPlistFromString). Still have some warnings like this:
"The readPlist function is deprecated, use load() instead"
- _GetOutputNoError() in tweak_info_plist.py has no usage. Removed.
No intended behavior change.
Bug: 941669
Change-Id: Ibc204fad8b56e864a083046559133403dcf99fe3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392289
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805790}
GitOrigin-RevId: 1fdde535bbe5fb06abdb35a7aadf5e5903ab3913
Improves error messages for existing asserts, and adds one for
blink_symbol_level=0
Bug: 1126200
Change-Id: I6624f6858ee568a33b5174ab8ba7c1834c1d5f56
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2401853
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805578}
GitOrigin-RevId: 73b000940e519d13ccb4e326fa26e297bb620e17
This reverts commit 1d5cb6af5192be1b701b389024e7c0121e8f2a7d.
Reason for revert: Breaking v8 kitkat bots
Original change's description:
> Increase android32_ndk_api_level 16 -> 21
>
> We only support 21+, so we should build for it.
>
> Bug: 1116198
> Change-Id: I552a946b245de0f54485ea985e08b53b92186bb1
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367984
> Reviewed-by: Ben Mason <benmason@chromium.org>
> Commit-Queue: Ben Mason <benmason@chromium.org>
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#804976}
TBR=agrieve@chromium.org,benmason@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 1116198, 1126469
Change-Id: Ia59936b975b6a17ec102fea02b9e86ba15de7b7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2401268
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805510}
GitOrigin-RevId: 35c44df96c33dfd83a58d1d0683f30929e16c267
Ash-chrome occasionally fail to start even after 20s, which causes
infrastructure failures on linux-lacros-rel. This CL mitigates the
issue by adding a retry logic so that the test runner script attempts
to start ash-chrome up to 3 times.
Bug: 1126185
Change-Id: Ibf80b6dbee51645db600e2804a53ca4d5320ca0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2399618
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Sven Zheng <svenzheng@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805420}
GitOrigin-RevId: d32df2d55eac403fd90fe539961b05877dd78f77
This CL:
- Sets resource_overlay=true in //weblayer:components_java_strings to
indicate that the target duplicates resources in
//components/strings:components_locale_settings
- Renames
android_webview/nonembedded/java/res_devui/drawable/ic_search.xml as the
resource conflicts with R.drawable.ic_search
BUG=1093825
Change-Id: Ica9c2335fdf688bec594f842e617e82e1a826773
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2389229
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805181}
GitOrigin-RevId: 5a3468d7f408eda7fb07f8979ea3b7b22c5ec817
code.google.com redirects no longer work. This CL replaces links in /build/android
to source.chromium.org equivalent.
This CL was uploaded by git cl split.
R=tiborg@chromium.org
Change-Id: I0862b5c23da99ee793239f19baf0f4fffbfefe81
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392760
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804989}
GitOrigin-RevId: d8d6c9fc027f3bd8057e26db1ac4c912240a7a9b
With all current targets setting create_srcjar=false, we can remove all
code that creates srcjars in prepare resources so that no new usages are
created.
TBR= #cced OWNERS, just a mechanical deprecation change (for the files outside of build).
Bug: 1073476
Change-Id: I102744c75f9be1ee8e78203a524a12a474f55390
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392740
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804979}
GitOrigin-RevId: 2bc4ba086520af61dec3ab3b2c0599f99b35149f
We only support 21+, so we should build for it.
Bug: 1116198
Change-Id: I552a946b245de0f54485ea985e08b53b92186bb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367984
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804976}
GitOrigin-RevId: 1d5cb6af5192be1b701b389024e7c0121e8f2a7d
Renames occurrences in //tools/grit as well as all spots that
are transitively affected by the rename.
Opts grit testdata out of PRESUBMIT.py checks since we don't
need UI snapshots for strings in unit tests.
Bug: 1097644
Change-Id: Ieca51c233447ded9d5943ad878354cbdaa1de78d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386392
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804288}
GitOrigin-RevId: 0e8790c5fc8ab5df43ccf072bf2fdbdcb57d498c
In order to migrate it with chromeos/chromeos_buildflags.h.
BUG=1114198
TEST=Build locally. Ran tryjob.
Change-Id: Idbec0af0b6dbcc95f0758494c1e4800980782855
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377169
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: David Bertoni <dbertoni@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804252}
GitOrigin-RevId: 7c68f583cb1c461dcd9ad6d56778e95aa13f7543
Fixes the Gold interaction code not properly handling the case where a
bug on Gold's end prevents it from writing a triage link to the provided
file.
Bug: 1124368
Change-Id: Ic3e9a4d8808b97831fba1c4f42338b6b1435acde
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391505
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Sven Zheng <svenzheng@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Sven Zheng <svenzheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804107}
GitOrigin-RevId: 53d6cf9868ab6a87a309305aba4a1f439c6a38ab
This CL modifies lacros_resource_sizes.py to compute total files sizes
and total compressed sizes. Compression relies on gzip as an external
tool.
Also add tracking for WidevineCdm/ directory.
Bug: 1106626
Change-Id: I84ac09b4f66f8f55bb1869e2917cdaa60ef4bf03
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2390877
Commit-Queue: Samuel Huang <huangs@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803974}
GitOrigin-RevId: e7bc8b040af4d12b3938a4b0ea5c64f016927483
shutil.rmtree fails if asked to delete a single file, so change
build/config/ios/hardlink.py to use os.unlink/shutil.rmtree based
on the output type (directory, file, symlink, ...).
Bug: none
Change-Id: I861c215e91b455e5b24f8159e162f21644a4bd47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2390183
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803861}
GitOrigin-RevId: af8f4f5d6065be3c60bb5a1b3ccefb94bea6493f
Android resource_sizes.py suppresses the following command line params
to confirm to isolate script interface:
--isolated-script-test-filter
--isolated-script-test-perf-output
The initial version of lacros_resource_sizes.py did not copy the
suppression code, resulting in failure when integrated with a trybot.
This CL fixes the issue.
Bug: 1106626
Change-Id: Iee4cc1e1e9fba7e070b4c03ef6501fc259e1390a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2389422
Reviewed-by: Erik Chen <erikchen@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803845}
GitOrigin-RevId: cc30baacbaa63c1a3a50cb248b394c169b876ae0
This CL:
Adds to android_apk_or_module() template:
- enforce_resource_overlays parameter to indicate that strict resource
override checking is desired. The purpose is to enable landing this CL
without breaking downstream.
Adds to android_resources():
- resource_overlay parameter to indicate that the target overrides
another target's resources
BUG=1093825
Change-Id: I4229b343654f873c22c3e58bbbfd01209d9c880c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367352
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: benjamin joyce <bjoyce@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803775}
GitOrigin-RevId: 629170f53008773b0808a62ae797fbc1c3d07b1d
When defining lint_suppressions_dep it might not be used when
generating some variants of the project for Android.
Change-Id: I056865bd030201448c870f259e0b0027c9c71eee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2385361
Reviewed-by: Peter Wen <wnwen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803573}
GitOrigin-RevId: 1a75ed030df55be4cafd526a29425c3af60d7ed4
This is a reland of 8ce938a2f69dcd0ad814f5045d30ba13d99b910e
Fixes vulkan tests on Linux FYI SkiaRenderer Vulkan
and angle tests on Linux Ozone FYI bot.
Original change's description:
> Reland "Reland "X11 and Ozone: enable use_x11 and use_ozone""
>
> This is a reland of 75363679c701c78fac57dea6b816f4c21c80bf5e
>
> Original change's description:
> > Reland "X11 and Ozone: enable use_x11 and use_ozone"
> >
> > This is a reland of f985905ebdd488c63b7819a65c817aa98fb8da49.
> >
> > This change broke our headless build:
> > ERROR at //ui/events/platform/x11/BUILD.gn:51:5: Assertion failed.
> > assert(ozone_platform_x11)
> > ^-----
> > See //components/viz/demo/BUILD.gn:73:7: which caused the file to be included.
> > "//ui/events/platform/x11",.
> >
> > Fix:
> > Don't include x11 build for headless case.
> >
> > Original change's description:
> > > X11 and Ozone: enable use_x11 and use_ozone
> > >
> > > This is the final change that enables use_x11
> > > and use_ozone for Linux builds and (as it was
> > > before) excludes X11 for chromeos, chromecast,
> > > lacros.
> > >
> > > in order to run ozone/X11/wayland, one must pass
> > > —enable-features=UseOzonePlatform
> > > —ozone-platform=x11 or wayland. otherwise,
> > > non-ozone/X11 is used.
> > >
> > > it’s also possible to completely disable X11
> > > so that clients, who need that kind of build can
> > > continue to have that.
> > >
> > > Bug: 1085700
> > > Change-Id: I171bcb53c406555a1d4bec3e88d76dc676310d48
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315869
> > > Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> > > Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
> > > Reviewed-by: Scott Violet <sky@chromium.org>
> > > Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
> > > Cr-Commit-Position: refs/heads/master@{#801523}
> >
> > Bug: 1085700
> > Change-Id: I8bf0abead6c94c95ddc58443de7cf2268c977cf1
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2376806
> > Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> > Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
> > Cr-Commit-Position: refs/heads/master@{#801692}
>
> Bug: 1085700
> Change-Id: Ia5ed2af9376354d3378d8edd98a7a1446f13c88b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2379190
> Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
> Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
> Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#802773}
Bug: 1085700
Change-Id: I26fb00938adc6a9e49576257ca316f23830e9cf1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382834
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803448}
GitOrigin-RevId: cc45a53ce5908f1d9bd4c98694a97eea3adae4cd
Logic was added to select the right package, based on packages available
within the distro, but the final dev list assignment overwrote what was
selected based on distro. This results in a breakage for Ubuntu based
builders that still utilize the older package.
Bug: 1122846
Test: './install-build-deps on Ubuntu'
Change-Id: Ia96d29c2b2767bb3a22b002cfba97a9525d246e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386659
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803302}
GitOrigin-RevId: 6063682ae60b84c2a5e96be3077834923a1af0e4
Will always try to check for LUCI_CONTEXT to have a sink and upload if
it does.
Bug: 1104238
Change-Id: I37d7de2a6e9ea72d43b5ef17874b11f2eca242cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382892
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803291}
GitOrigin-RevId: 204ff5b3950cbb77ca90fa24fa3eed35a6ed9d22
Java code can have per-target lower-than-default min_sdk_versions, but
the same is not true for native code. In order to increase
min_sdk_version for native code, it must be done globally.
Bug: 1116198, 1119402
Change-Id: Id6e55027f57bae26fc13b4338c4b16c462dfacf5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367649
Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803202}
GitOrigin-RevId: 384463e4b49150229134f4a5a7a5589e2437f53b
This reverts commit 8700df8a8aef14e8d88dec7668be4b4e16c7c204.
Reason for revert:
Android builders started failing since this commit:
https://ci.chromium.org/p/chrome/builders/ci/android-builder-perf/217957
Traceback (most recent call last):
File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 105, in Main
ret = self.args.func()
File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 378, in CmdGen
return self.RunGNGen(vals)
File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 961, in RunGNGen
ret = self.GenerateIsolates(vals, isolate_targets, isolate_map, build_dir)
File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 1075, in GenerateIsolates
command, extra_files = self.GetIsolateCommand(target, vals)
File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 1392, in GetIsolateCommand
'generated_scripts can no longer customize the script path')
AssertionError: generated_scripts can no longer customize the script path
Original change's description:
> Rename wrapper_scripts for generated_script tests in MB.
>
> A few tests (some Android resource_sizes tests, and one Perfetto
> test), were using generated_script tests that were generating
> wrappers that weren't named 'bin/run_$target_name'.
>
> We want all generated_script tests to be using consistent names, so
> this CL changes those targets.
>
> Bug: 816629
> Change-Id: If447fbee6b33637de4c9711e87379128272285af
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380672
> Commit-Queue: Dirk Pranke <dpranke@google.com>
> Reviewed-by: John Chen <johnchen@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#802694}
TBR=dpranke@google.com,agrieve@chromium.org,johnchen@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 816629
Change-Id: I11ec06405105860f01f3b7752df2024615f7badc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2384069
Reviewed-by: Wenbin Zhang <wenbinzhang@google.com>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802984}
GitOrigin-RevId: 56428611ac02c50b40bdb2d951f9d94e5a4bb617