GitLab

Add a target for merging the manifest file where a launcher icon is
added for WebView dev UI. This removes manifest merging from
"dev_ui_resources" definition and consequently from
"//android_webview:apk:apk_java". This makes it safe to depend on
"apk_java" target without triggering any manifest merging for targets
like WebView instrumentation tests.

Fixed: 1020444
Test: `webview_devui_show_icon=true` and bin/run_webview_instrumentation_test_apk
Test: Manually verify launcher icon after building SystemWebView, MonoChrome and Trichrome
Change-Id: Iba7e714ddb0b525828445565696e94327c9dfd84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904674
Commit-Queue: Richard Coles <torne@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Auto-Submit: Hazem Ashmawy <hazems@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714673}