Commit 74b78ce9 authored by Chris Mumford's avatar Chris Mumford Committed by Commit Bot

[aw] Rename android_webview_... targets to webview_instrumentation_...

r472276 renamed two targets:

1) android_webview_apk ==> webview_instrumentation_apk.
2) android_webview_test_apk ==> webview_instrumentation_test_apk.

However, there were two local targets which should have been renamed
for consistency, but were not:

1) android_webview_apk_assets ==> webview_instrumentation_apk_assets.
2) android_webview_apk_resources ==> webview_instrumentation_apk_resources.

Bug: 701938
Change-Id: I09b7f8109472e5ad0c9c2b5639dbb3e4e656cf74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1772691Reviewed-by: default avatarRichard Coles <torne@chromium.org>
Commit-Queue: Chris Mumford <cmumford@google.com>
Cr-Commit-Position: refs/heads/master@{#690900}
parent a689f9ab
...@@ -44,8 +44,8 @@ if (public_android_sdk) { ...@@ -44,8 +44,8 @@ if (public_android_sdk) {
android_apk("webview_instrumentation_apk") { android_apk("webview_instrumentation_apk") {
deps = [ deps = [
":android_webview_apk_assets", ":webview_instrumentation_apk_assets",
":android_webview_apk_resources", ":webview_instrumentation_apk_resources",
"//android_webview:android_webview_java", "//android_webview:android_webview_java",
"//android_webview:android_webview_locale_config_java", "//android_webview:android_webview_locale_config_java",
"//android_webview:common_java", "//android_webview:common_java",
...@@ -90,12 +90,12 @@ android_apk("webview_instrumentation_apk") { ...@@ -90,12 +90,12 @@ android_apk("webview_instrumentation_apk") {
command_line_flags_file = "android-webview-command-line" command_line_flags_file = "android-webview-command-line"
} }
android_resources("android_webview_apk_resources") { android_resources("webview_instrumentation_apk_resources") {
resource_dirs = [ "shell/res" ] resource_dirs = [ "shell/res" ]
custom_package = "org.chromium.android_webview.shell" custom_package = "org.chromium.android_webview.shell"
} }
android_assets("android_webview_apk_assets") { android_assets("webview_instrumentation_apk_assets") {
deps = [ deps = [
"//android_webview:pak_file_assets", "//android_webview:pak_file_assets",
"//third_party/icu:icu_assets", "//third_party/icu:icu_assets",
......
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