Commit 557c4bcf authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Reland "Add resource_sizes targets for webview bundle & trichrome"

This reverts commit be32a5a1.

Reason for revert:
* Downstream target renamed.
* Perf tryjob shows issue is fixed.
* No changes from original.

Original change's description:
> Revert "Add resource_sizes targets for webview bundle & trichrome"
>
> This reverts commit 7a07674d.
>
> Reason for revert: Causing build errors on perf waterfall (crbug.com/1091991)
>
> Original change's description:
> > Add resource_sizes targets for webview bundle & trichrome
> >
> > Bug: 1091256
> > Change-Id: I244afe4d9735901937b39c0d0c554eddaf88eace
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2230493
> > Reviewed-by: Richard Coles <torne@chromium.org>
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#775727}
>
> TBR=torne@chromium.org,agrieve@chromium.org,benmason@chromium.org
>
> Change-Id: Id9ac2e4f9ec7fc9eb0c2b3a6761ca2a822d8b242
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1091256, 1091991
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2233860
> Reviewed-by: John Chen <johnchen@chromium.org>
> Commit-Queue: John Chen <johnchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#775803}

TBR=torne@chromium.org,agrieve@chromium.org,johnchen@chromium.org,benmason@chromium.org

Bug: 1091256, 1091991
Change-Id: Icd2c9aff8a4d9c9e2c0268df010bfad95643c1b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2233922Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776022}
parent 1fc07d10
......@@ -69,6 +69,19 @@ if (enable_webview_bundles) {
min_sdk_version = 21
compress_shared_libraries = true
}
if (is_official_build) {
# Used for binary size monitoring.
create_app_bundle_minimal_apks("system_webview_minimal_apks") {
deps = [ ":system_webview_bundle" ]
bundle_path = "$root_build_dir/apks/SystemWebView.aab"
}
android_resource_sizes_test("resource_sizes_system_webview_bundle") {
file_path = "$root_build_dir/apks/SystemWebView.minimal.apks"
data_deps = [ ":system_webview_minimal_apks" ]
}
}
}
if (android_64bit_target_cpu) {
......@@ -152,6 +165,19 @@ if (enable_webview_bundles) {
min_sdk_version = 29
static_library_provider = "//chrome/android:trichrome_library_apk"
}
if (is_official_build) {
# Used for binary size monitoring.
create_app_bundle_minimal_apks("trichrome_webview_minimal_apks") {
deps = [ ":trichrome_webview_bundle" ]
bundle_path = "$root_build_dir/apks/TrichromeWebView.aab"
}
android_resource_sizes_test("resource_sizes_trichrome_webview_bundle") {
file_path = "$root_build_dir/apks/TrichromeWebView.minimal.apks"
data_deps = [ ":trichrome_webview_minimal_apks" ]
}
}
}
# Trichrome WebView APK for a 64-bit Chrome.
......
......@@ -2710,6 +2710,28 @@ if (public_android_sdk) {
verify_native_libs_and_assets = _enable_libs_and_assets_verification
}
if (is_official_build) {
# Used for binary size monitoring.
create_app_bundle_minimal_apks("trichrome_chrome_minimal_apks") {
deps = [ ":trichrome_chrome_bundle" ]
bundle_path = "$root_build_dir/apks/TrichromeChrome.aab"
}
android_resource_sizes_test("resource_sizes_trichrome") {
apk_name = "Trichrome"
trichrome_chrome_path =
"$root_build_dir/apks/TrichromeChrome.minimal.apks"
trichrome_webview_path =
"$root_build_dir/apks/TrichromeWebView.minimal.apks"
trichrome_library_path = "$root_build_dir/apks/TrichromeLibrary.apk"
data_deps = [
":trichrome_chrome_minimal_apks",
":trichrome_library_apk",
"//android_webview:trichrome_webview_minimal_apks",
]
}
}
if (android_64bit_target_cpu) {
monochrome_or_trichrome_public_bundle_tmpl("monochrome_32_public_bundle") {
bundle_suffix = "32"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment