[WIP] Rename android_webview_apk

android_webview/test/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
 import("//testing/test.gni")
 
 # Mark all targets as test only.
 testonly = true
 
 group("test") {
   deps = [
     ":android_webview_test_apk",
     ":android_webview_unittests",
   ]
 }
 
-android_apk("android_webview_apk") {
+android_apk("builtin_webview_shell_apk") {
   deps = [
     ":android_webview_apk_assets",
     ":android_webview_apk_resources",
     "//android_webview:android_webview_java",
     "//android_webview:locale_pak_assets",
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/policy/android:policy_java_test_support",
     "//content/public/android:content_java",
     "//ui/android:ui_java",
   ]
 
-  apk_name = "AndroidWebView"
+  apk_name = "BuiltinWebViewShell"
   android_manifest = "shell/AndroidManifest.xml"
   java_files = [
     "shell/src/org/chromium/android_webview/shell/AwShellActivity.java",
     "shell/src/org/chromium/android_webview/shell/AwShellApplication.java",
     "shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java",
     "shell/src/org/chromium/android_webview/shell/AwShellSwitches.java",
     "shell/src/org/chromium/android_webview/shell/DrawGL.java",
     "shell/src/org/chromium/android_webview/test/AwInstrumentationTestRunner.java",
     "shell/src/org/chromium/android_webview/test/AwTestContainerView.java",
     "shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java",
@@ skipping 51 matching lines @@
   ldflags = [ "-Wl,-shared,-Bsymbolic" ]
   deps = [
     "//android_webview:common",
   ]
   configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
   configs += [ "//build/config/android:hide_all_but_jni" ]
 }
 
 instrumentation_test_apk("android_webview_test_apk") {
   apk_name = "AndroidWebViewTest"
-  apk_under_test = ":android_webview_apk"
+  apk_under_test = ":builtin_webview_shell_apk"
   android_manifest = "../javatests/AndroidManifest.xml"
   deps = [
     "//android_webview:android_webview_crash_services_java",
     "//android_webview:android_webview_java",
     "//android_webview:android_webview_platform_services_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/minidump_uploader:minidump_uploader_javatests",
     "//components/policy/android:policy_java",
@@ skipping 179 matching lines @@
     "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
   ]
 }
 
 shared_library("libdrawgl") {
   sources = [
     "shell/src/draw_gl/draw_gl.cc",
   ]
   configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
 }