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
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
These were temporarily disabled to allow a multi-sided merge.
Tbr: bialpio@chromium.org
Bug: 1113301
Change-Id: I1d9ef778868e89547ef42117cfb804304558890f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2376028
Reviewed-by: Piotr Bialecki <bialpio@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802501}
GitOrigin-RevId: 615444a51cb6fc9cc23305da43f5b93bde733a4c
This is unused, and now that we have an expectations file this should still
be easy enough to audit.
Change-Id: Ic48e76ed4e1b90e351c27a350cf82d3f6b0fea6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380576
Auto-Submit: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802443}
GitOrigin-RevId: 911c0aaf96e5ee85bcd921f6170b1ac71998c483
We should ensure that no new usages of the real targets can be added.
Change-Id: I4999c2257f9aedef38809c4f182f419c8bed058c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2357452
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799813}
GitOrigin-RevId: b7098f557444b7780f9e0fa84b9b84c2475153c3
The flag is guarded by treat_warnings_as_errors=false so that it
will apply only to local developer builds.
Results from //tools/android/build_speed/benchmark.py base_java_sig:
With change:
base_java_sig: 68.0s avg (68.8s, 67.2s)
base_java_sig: 68.4s avg (68.6s, 68.2s)
Without change:
base_java_sig: 69.4s avg (69.3s, 69.5s)
base_java_sig: 69.7s avg (69.7s, 69.7s)
time out/Debug/bin/run_base_junit_tests:
With Change:
real 0m22.741s
real 0m23.543s
Without change:
real 0m23.176s
real 0m24.328s
Bug: 1117222
Change-Id: I4bfd742165468bf9538e6fa0dc8f35daa9e0f23f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2313299
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799285}
GitOrigin-RevId: 132e1debe3ff6fe2732b8b612534d7c207651777
This adds basic support for building WebLayer as an isolated split in
WebView. A new gn arg "weblayer_in_split" is added which will move
WebLayer Java code to it's own DFM if true.
Supporting isolated splits required some client changes in WebLayer, so
I added a check in WebLayerFactoryImpl.isClientSupported() to make sure
isolated splits aren't used with an unsupported client.
This also adds the ability to write the version_name and version_code of
a bundle module to the build_config, which allows DFMs to match the base
module version info (an error is thrown if these don't match). This
makes it easy to share version info, since computing WebView
version_code is pretty complicated.
The bundle with isolated splits won't install correctly with the current
version of bundletool we have in Chromium, but I'm working in parallel
on fixing bundletool.
Bug: 1105096
Change-Id: Id5522b42e283dc813fa84aaedc806f7519b586ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353378
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798815}
GitOrigin-RevId: c5f986b96cff358525864463b5fce0c195f6b9a2
Previously all lint targets shared one lint suppressions/config file:
//build/android/lint/suppressions.xml
This resulted in many unnecessary suppressions being added which then
suppress the lint checks for every lint target. e.g. if monochrome fails
ObsoleteSdkInt checks, suppressing it globally turns off the checks for
all other apks, which decreases the utility of android lint for all
those other apks.
This CL removes the shared suppressions.xml file and splits its content
between the targets that actually need them, and adds lint-baseline.xml
files where necessary. This also removes the bottleneck of requiring a
//build/android/OWNERS to stamp every lint suppression change.
This CL also adds suppressions for targets depending on code that chrome
already lints via monochrome. E.g. errors in //base are shared by all
embedders' lint targets, and it should not become the burden of targets
like cast shell or cronet to fix. Thus these errors are suppressed in
cronet/cast/remoting-specific suppressions.xml files.
This CL changes lint to run in the output directory so that baseline
suppressions work for generated files (e.g. AndroidManifest.xml).
Bug: 1113795,1115594
Fixes: 1115594
Change-Id: I2d70128707c0fa862c109b6f91631a07916c90d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346857
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798776}
GitOrigin-RevId: f74622e693e698c40edd15ca0bc7b75b080f5509
If the update_android_aar_prebuilts gn arg is set, all info files are
updated. However, some info files could actually not be part of the repo
but instead be pulled in via cipd along with the aar itself. This cl
adds a gn template flag to disable updating info files for
android_aar_prebuilt targets that specify it.
Change-Id: I5b82b8e614ab989936834a1b270c0d97bba2da3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353355
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797847}
GitOrigin-RevId: 92baa450571abe2c5c8dba1d1c91ba1df23fb027
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
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
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
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
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
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
Lint is no longer implicitly run as part of an apk or bundle target. If
a specific apk or bundle wants to turn on its own lint and have that run
automatically on every build, the enable_lint flag can be used. See:
"boundary_interface_example_apk".
A new target //chrome/android:android_lint (or simply "android_lint")
has been added. This currently runs either monochrome_public_bundle's
lint task or a list of default targets if such a list is defined.
For chrome apk/bundle targets based on chrome_public_apk_tmpl.gni, they
will automatically get a data_dep added on the new unified lint target
so most devs' workflow will not need to change.
APKs in for {remoting,cronet,cast} have enable_lint added explicitly in
this CL to preserve their existing behaviour.
NewApi and VisibleForTests checks have been disabled for test apks, with
a TODO for turning at least NewApi back on.
Bug: 1108791
Fixed: 1108791
Change-Id: I6534fcd6dc7af1d7a12720a98f8d0d09bee8f161
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2318549
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792728}
GitOrigin-RevId: f40e2d02801df0a75a88a63e76ede485739e2d22
Allow linting with a minSdkVersion that is different that the current
APK/Bundle's min_sdk_version. This paves the way for using a single
unified target for most lint runs.
e.g. monochrome_public_bundle can set lint_min_sdk_version to 21 so that
it lints against a lower minSdkVersion than its min_sdk_version (24).
Bug: 1108791
Change-Id: I703d1ef19f7fc9182f52bc6ef0ae8535c024b10f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316334
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791925}
GitOrigin-RevId: 623263d6782306905fb384d1688b6d8798784c39
* Refactors more common logic for the three expectation file types
into diff_utils.py
* Changes sort order for proguard expectations so that they diff better
* Output "actual_data" rather than .stamp files for expectation targets
* Stop writing out .proguard_configs for all proguard runs
* I don't think these files have been referenced for a long time, and
the expectations file largely serves their purpose in a more
discoverable way.
* Don't define validate_expectations GN group unless it will
have deps (to prevent thinking your GN args are correct when
they are not).
Bug: 1064151
Change-Id: I5394471e7defd2c2f7e2f2173097a11d830cde65
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314265
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791342}
GitOrigin-RevId: 5b72f4a35e83cd3ad7358128d79b6ac3245bf138
Remove allowlist for bypassing turbine direct deps since the last items
in the allowlist (cronet and modules) have been removed.
Bundle feature modules require the base module in their classpath.
Previously they were able to get by since the base module was added to
their transitive classpath, but the base module should be in their
direct classpath as it is used directly in R.java via inheritance.
Fix in reland:
- Add missing dep on base module java
Tbr: agrieve@chromium.org for reland
Fixed: 1082904
Bug: 1082904
Change-Id: I4b2d6a173ad207efcc9730589b1322a02071a2c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314938
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791258}
GitOrigin-RevId: 85f7ce53467938a068a0a670db400eec1090a739
This reverts commit 660b593306570c04200321f99aaac34831c3d490.
Reason for revert: Broke android-archive-rel
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8874020961794812528/+/steps/compile/0/stdout
Original change's description:
> Android: Use direct deps for cronet and modules
>
> Remove allowlist for bypassing turbine direct deps since the last items
> in the allowlist (cronet and modules) have been removed.
>
> Bundle feature modules require the base module in their classpath.
> Previously they were able to get by since the base module was added to
> their transitive classpath, but the base module should be in their
> direct classpath as it is used directly in R.java via inheritance.
>
> Fixed: 1082904
> Bug: 1082904
> Change-Id: I75d89815de894c64581b98e35243aca5bc8d4e93
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314757
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Auto-Submit: Peter Wen <wnwen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#791117}
TBR=wnwen@chromium.org,agrieve@chromium.org
Change-Id: Iac0700e90845d2e1b85ed860abbff4c6c942df42
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1082904
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315009
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791126}
GitOrigin-RevId: 349aba7e7c58ed797dd134987b8c74f1f6018ce9
Remove allowlist for bypassing turbine direct deps since the last items
in the allowlist (cronet and modules) have been removed.
Bundle feature modules require the base module in their classpath.
Previously they were able to get by since the base module was added to
their transitive classpath, but the base module should be in their
direct classpath as it is used directly in R.java via inheritance.
Fixed: 1082904
Bug: 1082904
Change-Id: I75d89815de894c64581b98e35243aca5bc8d4e93
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314757
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791117}
GitOrigin-RevId: 660b593306570c04200321f99aaac34831c3d490
Add more logging into test runner.
Bug: 1060399
Change-Id: I4bdc9ac8413f8ea04433ae927106f73d94788330
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2253083
Commit-Queue: Arthur Wang <wuwang@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791091}
GitOrigin-RevId: 3ab9a142091516aa57f10feebc46dee649ae4589
A collection of bugfixes for creating R.java in java_library_impl
targets:
- test libraries support.
- apk under test R.java shadowing bugfix.
- always generate onResourcesLoaded like package resources did.
- Fix issue where R.java is not generated for the apk package name.
- Change webAPK manifest package name (remove .new because it is a java
keyword).
Reason for reland: Fixed build issue with webAPKs.
Original CL: https://chromium-review.googlesource.com/c/chromium/src/+/2302919
This reverts commit 1895ffb4f48aa8e0ef0f64291d40d5e0e9037bd1
Bug: 1073476
Change-Id: Ic095091eb64db32d1653e219f507463de59cacf4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2307809
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790428}
GitOrigin-RevId: 1e900731f221f60ba590d99741625047c51b844a
A collection of bugfixes for creating R.java in java_library_impl
targets:
- test libraries support.
- apk under test R.java shadowing bugfix.
- always generate onResourcesLoaded like package resources did.
- Fix issue where R.java is not generated for the apk package name.
Bug: 1073476
Change-Id: I0cebd9626b0ce9049554f8345af516f7bd0ec2aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302919
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789690}
GitOrigin-RevId: 7a1a3bdcb3bdd19a30ded0752c609e2e8aea1942
We migrated into an inheritance based R.java files that means that each
R.java file has access to all resources without manually specifying each
resource individually. This means the extra_r_text_files option is no
longer needed/used since we no longer need to know exactly what is in
each R.java file separately.
Change-Id: I71ebabda0d998a53a0ae54b8a3fd6cd84311105d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302933
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789316}
GitOrigin-RevId: eac6444a79e4ea5e6209e1fe760776812dd23c91
The custom Chromium errorprone plugins were unintentionally disabled
as a result of
https://chromium-review.googlesource.com/c/chromium/src/+/2133870
This CL re-enables the errorprone plugins by using the
auto_service_processor in the javac compile of the
errorprone_plugin java_binary. This preserves the META-INF service
provider configuration generated by auto_service_processor.
This CL:
- Adds the 'processor_generates_service_provider_configuration'
parameter to the java_annotation_processor() template to indicate
whether the annotation processor generates the META-INF service provider
configuration files. If a library depends on an annotation processor
which has the parameter set, the annotation processor will be
passed in the --processorpath and --processor parameters in the javac
compile in addition to the turbine compile.
- Adds the 'errorprone_stderr_path' to the java_library() template to
save the stderr output of the errorprone compile to a file.
BUG=1104558
TEST=errorprone_plugin:tests
Change-Id: If224e9a2cb62b3fae72ffb6664aa54770530672d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2291983
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788647}
GitOrigin-RevId: b8c6444fbfead99b92e5419bf5c81cf7813673c3
It's really unusual to have a template that does not result in a target
with name=target_name. In this case android_test_apk() was appending
"__apk" for no apparent reason.
Change-Id: I0867622ff27962aebc1c64c12a57c8ab0925d6de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2293216
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#787776}
GitOrigin-RevId: d184159c34056acee5c950c22368bc83b605862d
To prevent issues where multiple android_resources targets have the same
R.java package, java_library_impl can be configured via
"resources_package" to generate its own R.java (for all transitive
dependencies) rather than using the srcjars provided by its direct
android_resources targets.
Prebuilts no longer create R.java srcjars. Instead, you either need to
depend on the prebuilt from an android_resources target (soon to be
deprecated) or add a resources_package to your android_library target so
it generates a comprehensive R.java for all your target's dependencies.
Bug: 1073476
Change-Id: If06dab74c1d9763a93ffec552caded284d4725a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2281034
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786862}
GitOrigin-RevId: adbe4e48ff767bbd15cacacdb4a4478fac4f8b81
This reverts commit fb07fcffe0d9785c3d582b1c11900cfd07595dc4.
Reason for reland: Not changing target_sdk_version for angle tests
Original change's description:
> Revert "Android: Bump default target_sdk_version 24 -> SDK used to compile"
>
> This reverts commit b7fb15b170d9f2da28908e91cfdaf193eb2170d6.
>
> Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1099849
>
> Original change's description:
> > Android: Bump default target_sdk_version 24 -> SDK used to compile
> >
> > Why do this?
> > * It's best practice to target the latest sdk, so this makes for a
> > better default.
> > * Many targets were neglecting to ever update this value
TBR=boliu@chromium.org,torne@chromium.org,agrieve@chromium.org,behdadb@chromium.org
Bug: 1099849
Change-Id: I95f36a2b88d2e7ad1d90222f25192c9a915550ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2280981
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786275}
GitOrigin-RevId: e0f5a1c0395878679d487ebfccc2cf576f69b96c
This reverts commit b7fb15b170d9f2da28908e91cfdaf193eb2170d6.
Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1099849
Original change's description:
> Android: Bump default target_sdk_version 24 -> SDK used to compile
>
> Why do this?
> * It's best practice to target the latest sdk, so this makes for a
> better default.
> * Many targets were neglecting to ever update this value
>
> TBR=agrieve # Minor BUILD.gn refactoring
>
> Bug: None
> Change-Id: Idb3983bcfb7a1ddaf13900e0acdbee425a450225
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2265513
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Richard Coles <torne@chromium.org>
> Reviewed-by: Bo <boliu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#783112}
TBR=boliu@chromium.org,torne@chromium.org,agrieve@chromium.org
Change-Id: Ia3cf4acb936a6057d8d925335e886bbcf6616026
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2269752
Reviewed-by: Behdad Bakhshinategh <behdadb@chromium.org>
Commit-Queue: Behdad Bakhshinategh <behdadb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783171}
GitOrigin-RevId: fb07fcffe0d9785c3d582b1c11900cfd07595dc4
Why do this?
* It's best practice to target the latest sdk, so this makes for a
better default.
* Many targets were neglecting to ever update this value
TBR=agrieve # Minor BUILD.gn refactoring
Bug: None
Change-Id: Idb3983bcfb7a1ddaf13900e0acdbee425a450225
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2265513
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783112}
GitOrigin-RevId: b7fb15b170d9f2da28908e91cfdaf193eb2170d6
Allows R8 and lld to run concurrently, saving on build times.
Bug: 1078460
Change-Id: I9ee978800b649634461c49ced4a26ca5015869cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2259292
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782274}
GitOrigin-RevId: 71bd025e860a3fd09bbace45ccf5501d408cda2b
This reverts commit 8a3e6a2898a3dd20e625cd5013a813982bc6bb63.
Reason for revert: Revert before next branch cut, was only required for a cherry-pick to M84
Original change's description:
> Rollback protobuf lite runtime to 3.0.1
>
> As a temporary fix for android webview regression b/157318961 this cl
> rolls back the protobuf lite runtime to 3.0.1 using the codegen plugin.
>
> Binary-Size: This is temporary and there is not really much we could do.
> Bug: 1093059, b/157318961
> Change-Id: I2bbaf6d3b434221b667901423c4616e26a7550c5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2238872
> Reviewed-by: Dan H <harringtond@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#777495}
TBR=yfriedman@chromium.org,agrieve@chromium.org,mheikal@chromium.org,harringtond@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 1093059, b/157318961
Change-Id: Ieda4530327ff3de513601ae3fe0ad5e9c99eeed0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2264466
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Dan H <harringtond@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782219}
GitOrigin-RevId: 25f926b7a707a70db7c41a8f1ecf1566a3ffec1b
This is easier to follow then deriving it in the templates.
Also changes webview expectations apk->bundle
Bug: 1095654
Change-Id: I5952ee9a660e4f32b22ef4100fea2f231d9eb96d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2245880
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#780157}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4a914f2106e06d3cee338fdd4ee46457e985df97
Peter Kotwicz
Yngve N. Pettersen
Andrew Grieve
Justin DeWitt
Sam Maier
Wei-Yin Chen (陳威尹)
Mohamed Heikal
Hajime Hoshi
Clark DuVall
Peter Wen
Brandon Mousseau
Arthur Wang
Brian Sheedy
Behdad Bakhshinategh
Tanmoy Mollik