This change extends android_aar_prebuilt to support including any assets
in the aar file in the output. Currently, if the source aar file
contains any files in the assets subdirectory, the target must define
the ignore_assets flag. This change now optionally allows the user to
instead supply the extract_assets flag so that the assets will be copied
to the output instead.
If assets are included in the source aar, then either ignore_assets or
extract_assets, but not both, must be set.
Assets will be copied to the output target with the same directory
structure as the input aar file.
Bug: 643966
Change-Id: Ibf66543fd9e9dc8db7221234b82c1d860f7f2724
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2350340
Auto-Submit: Brandon Mousseau <bmoose@google.com>
Commit-Queue: Brandon Mousseau <bmoose@google.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797544}
GitOrigin-RevId: 3f954b32ae3328f1521a9e944a9a419fe308558a
XTest/XRecord include XInput, so we need to get rid of those too
if we want to get rid of the macros etc that XInput provides.
Depends on WebRTC CL:
https://webrtc-review.googlesource.com/c/src/+/180773
BUG=1066670
R=nickdiego,sky
Change-Id: Id3b3cb61196cf10bc47976957d8b290877020d5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2327373
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Reviewed-by: Nick Yamane <nickdiego@igalia.com>
Cr-Commit-Position: refs/heads/master@{#797453}
GitOrigin-RevId: 0f27deab388de9e768d07d75de66438f63bc212d
Internal checkouts can use a different protocol buffers and runtime,
thus use variables to refer to them so they could be changed based on
your checkout.
TBR=# noop change to proto runtime target name
Bug: 1114836
Change-Id: I564b5f7bfa65ff549c335766c26b2d1dd07241fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346861
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797375}
GitOrigin-RevId: 15f141f41f26207b5bd3379118e3a8d1d777771c
This reverts commit 4edc050329e259e71389115a2bcf1c4b693b57a3.
Reason for revert: Breaks minidump generation on Windows
Original change's description:
> Add dbghelp.dll to delay load list
>
> Currently, many of the binaries have a static dependency on dbghelp.dll.
> This results in dbghelp getting loaded in all chrome processes. Upon
> inspection, dbghelp.dll is only necessary for stack sampling and mini
> dump handing in crashpad. Stack sampling is only enabled by default on
> unofficial builds of dev and canary. All other times we are needlessly
> loading this module which brings in 300k of image file refset and 60k
> of Copy on Write costs per process. This change adds it to the delay
> load list.
>
> Change-Id: I13da0ce0735431c5c51cdbc9ba2cfea0cc3cded7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2336541
> Commit-Queue: Chris Davis <chrdavis@microsoft.com>
> Reviewed-by: Cliff Smolinsky <cliffsmo@microsoft.com>
> Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#796707}
TBR=thakis@chromium.org,brucedawson@chromium.org,cliffsmo@microsoft.com,chrdavis@microsoft.com
Change-Id: I6051562e22eaa9e778b7077c3efab1129bdfd77c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2350744
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797080}
GitOrigin-RevId: 7bbae44fb25fadac09d029bb7d935781b6833e81
This reverts commit 393e7114bf6f2856eaf8147ec5d0c5f79849f115.
Reason for revert: Proper fix landed (see bug).
Original change's description:
> Reduce link pool to stop android-archive-rel OOM'ing
>
> I'd like to still work on a fix that doesn't reduce the size for bots
> with less RAM, but need something quick'ish to fix bot.
>
> Bug: 1098333
> Change-Id: Ifdfe8f07712e5073419ea0c0c0eb89092c31a1de
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2347384
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Dirk Pranke <dpranke@google.com>
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Cr-Commit-Position: refs/heads/master@{#796585}
TBR=dpranke@google.com,agrieve@chromium.org
Change-Id: I6b445001d0a8ab57d16f3ba2623906da1b509d37
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1098333
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2349398
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796896}
GitOrigin-RevId: 57a52af65d4da5c24fc7aac40048df00186794e9
Adds -Xmx1G to limit heap size to 1GB.
My local test of R8 on MonochromePublic.aab had a peak RSS
of 1.8GB with this flag and 8GB without it.
Does not seem to cause the command to run measurably slower.
I found that the r8 wrapper script in AOSP uses this same flag and
so does the Android lint wrapper script.
Bug: 1098333
Change-Id: Icca79bf6c1e9c8f003f613c178983f63cf9fbf04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2348018
Commit-Queue: Sam Maier <smaier@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796806}
GitOrigin-RevId: a9721228ea2259e9fbac3f87601321cfcd7720b1
Use libpango-1.0-0 instead of the old transitional name libpango1.0-0
for installing libpango.
Tested on Rodete (which no longer has the old transitional package).
TEST=sudo build/install-build-deps.sh
Bug: 1114652
Change-Id: I40affdc14d223e339bf6ccb5b33deac248b01279
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346184
Reviewed-by: Dan Elphick <delphick@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Sreeja Kamishetty <sreejakshetty@chromium.org>
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796772}
GitOrigin-RevId: 3c28652133e15a106e61f2a35c773c437d27848a
Currently, many of the binaries have a static dependency on dbghelp.dll.
This results in dbghelp getting loaded in all chrome processes. Upon
inspection, dbghelp.dll is only necessary for stack sampling and mini
dump handing in crashpad. Stack sampling is only enabled by default on
unofficial builds of dev and canary. All other times we are needlessly
loading this module which brings in 300k of image file refset and 60k
of Copy on Write costs per process. This change adds it to the delay
load list.
Change-Id: I13da0ce0735431c5c51cdbc9ba2cfea0cc3cded7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2336541
Commit-Queue: Chris Davis <chrdavis@microsoft.com>
Reviewed-by: Cliff Smolinsky <cliffsmo@microsoft.com>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796707}
GitOrigin-RevId: 4edc050329e259e71389115a2bcf1c4b693b57a3
1. Generate only one cmake add_library command.
2. Read all deps from project.json.
3. Update gradle build tool to 4.0.1.
4. Update docs.
Change-Id: I88fd4bcc969c158b1522da210bf815e598e55957
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342540
Commit-Queue: Richard He <linyhe@microsoft.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796646}
GitOrigin-RevId: b08a6943d587db5f90a2a3a193f54210ae8f3439
I'd like to still work on a fix that doesn't reduce the size for bots
with less RAM, but need something quick'ish to fix bot.
Bug: 1098333
Change-Id: Ifdfe8f07712e5073419ea0c0c0eb89092c31a1de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2347384
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#796585}
GitOrigin-RevId: 393e7114bf6f2856eaf8147ec5d0c5f79849f115
This reverts commit 67fc091c1c336ef0d4194ee157db2dba7324db00.
Reason for reland: Writing both build_vars.json & build_vars.txt
Original change's description:
> Revert "build_vars.txt: Changed to build_vars.json"
>
> This reverts commit 6e002e1f5dda6eb3007823395244eb5c7b42d372.
>
> Reason for revert: Official build failure crbug.com/1114609
>
> Original change's description:
> > build_vars.txt: Changed to build_vars.json
> >
> > And moved helper function into gn_helpers.py
> >
> > It was only ever in .properties format so that it
> > could be easily parsed by bash, but we no longer need
> > that.
> >
> > Also fixes default_android_sdk_version to be a string.
> > -next builds need it to be a string.
> >
> > Bug: None
> > Change-Id: I99541f18510de93dae4c0d68b734638564f74ee2
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340673
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
> > Reviewed-by: Dirk Pranke <dpranke@google.com>
> > Cr-Commit-Position: refs/heads/master@{#796020}
>
> TBR=dpranke@google.com,agrieve@chromium.org,mheikal@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: None
> Change-Id: Iad8597f6af00c534245fd1a40d1809d952758f47
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2344626
> Reviewed-by: Ben Mason <benmason@chromium.org>
> Commit-Queue: Ben Mason <benmason@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#796387}
Bug: 1114750
Change-Id: I1019351a294e54701c093911f67a1fb6b7bd34d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346965
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796456}
GitOrigin-RevId: 169e377d5b5acc14db212e039828908a750793e1
AGSA queries an apps icon by name and thus fails on collapsed names. The
fix is to not collapse mipmaps (application icons).
This also fixes an old layering bug where chrome only resources were
listed under android_webview by allowing multiple config files for use
by Monochrome and Trichrome. Additionally the directive no_obfuscate has
been deprecated with no_collapse as its replacement.
TBR=boliu@chromium.org # noop change to webview config file.
Bug: b/161564466
Change-Id: Idb735cd07e9e95ab572297c8dc4848451d8d52bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343755
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796449}
GitOrigin-RevId: ffd91e520d00750a8729d1aa2c48e879fb454c98
This lets java_cpp_enum and java_cpp_strings treat "WebView" like one
word. This also fixes an existing test in java_cpp_strings_tests.py.
Fixed: 1112005
Test: vpython build/android/gyp/java_cpp_strings_tests.py
Change-Id: Id9f1ca904b4d6c90ccc1a810033c5614a0514492
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2337735
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796445}
GitOrigin-RevId: 001d80b09f7e2e73ea5d2923ead7e8308adaac1c
Lint no longer requires manifest_package to be specified, so remove this
arg from lint.py as well as the gn templates.
Bug: 1108791
Change-Id: I4b48dc1ce3eb40ef8b4e703ca4ece475f2d28c4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339929
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796425}
GitOrigin-RevId: b4bf03c54733a8fe0a4a42fa2efa9f03215c803b
Need to ensure AwBrowserProcess.start isn't called multiple
times for a single process. Also add an annotation to disable
batching and use it for app cache tests, since app cache
can only be set once and the setting is global.
Bug: 989569
Change-Id: I360230ac612a004bda94dded1d9dd6cb2e3f14cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2335673
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796424}
GitOrigin-RevId: a460f0fcc71d72f4716366b1864d5955c22479b6
Rather than use one universal baseline.xml for lint, allow each target
that wants to use lint baselines to specify its own via the gn variable
lint_baseline. This also allows better co-location of baseline.xml and
the code that it refers to.
Also fixes the existing lint issues for cast apk.
Bug: 1108791
Change-Id: I982cd35636ce9e08817be6cf8b6cccd18455d8ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2327834
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Matt Reynolds <mattreynolds@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: John Rummell <jrummell@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796418}
GitOrigin-RevId: 45a32111683bb3ea12ce3b21752a9719d85607f6
This reverts commit 6e002e1f5dda6eb3007823395244eb5c7b42d372.
Reason for revert: Official build failure crbug.com/1114609
Original change's description:
> build_vars.txt: Changed to build_vars.json
>
> And moved helper function into gn_helpers.py
>
> It was only ever in .properties format so that it
> could be easily parsed by bash, but we no longer need
> that.
>
> Also fixes default_android_sdk_version to be a string.
> -next builds need it to be a string.
>
> Bug: None
> Change-Id: I99541f18510de93dae4c0d68b734638564f74ee2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340673
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Cr-Commit-Position: refs/heads/master@{#796020}
TBR=dpranke@google.com,agrieve@chromium.org,mheikal@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: None
Change-Id: Iad8597f6af00c534245fd1a40d1809d952758f47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2344626
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796387}
GitOrigin-RevId: 67fc091c1c336ef0d4194ee157db2dba7324db00
This CL adds the strings that will be used for the initial Android
language decouple UI.
Bug: 1113303
Change-Id: I62552adb641ec821ceef06be3fa62cb137aa009d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339340
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Megan Jablonski <megjablon@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Trevor Perrier <perrier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796375}
GitOrigin-RevId: 8616745b9a6ac72ca4ccec81db2ed4d82b589fa1
Combines the report generated from the host (junit) code coverage
with the report generated from the test a ran on device. It goes to each
method and updates the counters from whichever coverage is higher.
It then updates the lines covered in the source file and finally,
updates the counters.
Please note if an instruction has branch A,B,C, and one report covers
only branch A and another only covers Branch B and C, it will choose the
report results that cover branch B and C, showing A as uncovered. This
is because if one report covered A and B, and another covered B, we
can't say "3 branches are covered."
Bug: 1107004
Change-Id: I8dfa9feb80df5c9ed6d468226c25155383962519
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333065
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796081}
GitOrigin-RevId: d5f6f618da0d6f0f6d8bcba3a89d4c66b61467c8
This removes jumbo.gni, the imports of jumbo.gni, and
any remaining stray references to it in the build files and docs.
Bug: 994387
Change-Id: Ic39b7c609e1bd922e05c7e1104f1e5532c188f5a
AX-Relnotes: n/a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2337392
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#796080}
GitOrigin-RevId: 878b18040e2d5a6d2c39f5a49be6f9dc04c35d03
And moved helper function into gn_helpers.py
It was only ever in .properties format so that it
could be easily parsed by bash, but we no longer need
that.
Also fixes default_android_sdk_version to be a string.
-next builds need it to be a string.
Bug: None
Change-Id: I99541f18510de93dae4c0d68b734638564f74ee2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340673
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#796020}
GitOrigin-RevId: 6e002e1f5dda6eb3007823395244eb5c7b42d372
Hoping that this will aid in debugging out of memory failures.
Bug: 1113246
Change-Id: Ibf2baf859598a2af2d08d911c82d3c65f2249d28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2328190
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#795975}
GitOrigin-RevId: febea02a8bc013618adfc499a1795471241c541d
* Remove anchors for <application> since every manfiest change will cause
it to change.
* Use android:name to compute anchors when available since that will
lead to stable anchors when attributes / children are changed.
* Prevent self-closing tags for <service>, <activity>, etc.
* Added test.
Bug: 1064151
Change-Id: Ia0c242c713b58c6cb54556e6d0b82a559ad9858a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340644
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795923}
GitOrigin-RevId: 99a2505563f03c550af18d636cd7f3218b2e0a8a
Previously, the android manifest would be included always, this can
result in issues extra permissions being requested if minSdkVersion
is not set.
Bug: 1113301
Change-Id: I716fdf151a0ef56fbddfea990db2f0fe9b131f20
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340066
Reviewed-by: Haiyang Pan <hypan@google.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795719}
GitOrigin-RevId: 9eaee75f93dbe258773e55a5c5d06aa0fecb9682
Brandon Mousseau
Tom Anderson
chromium-autoroll
Mohamed Heikal
Brian Sheedy
Arthur Eubanks
Nico Weber
Andrew Grieve
Sami Kyostila
Chris Davis (EDGE)
Richard He
Sven Zheng
Chong Gu
Nate Fischer
Peter Wen
Bo Liu
Ben Mason
Trevor Perrier
Wei-Yin Chen (陳威尹)
Ben Joyce
Dirk Pranke
Justin DeWitt