Make WebAPK naming consistent 2/2

webapk/shell_apk/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")
 
 declare_args() {
   # The origin URL of minted apks, for example: "foo.com"
-  manifest_package_minting_origin = "template"
+  manifest_package_webapk_origin = "template"
 
   # The browser to which WebAPKs will be bound.
   runtime_host = "com.google.android.apps.chrome"
 
   # The URL for the minted apks, for example: "https://foo.com"
   host_url = "https://www.template.com/home_page"
   scope_url_host = "www.template.com"
 
   # The message authentication code from Chrome for identity verification.
   mac = "template"
 
   # The scope of the Urls that the Minted APKs could navigate to.
   scope = "https://www.template.com"
 }
 
-manifest_package_minting = "org.chromium.webapk"
+manifest_package_webapk = "org.chromium.webapk"
 
 shell_apk_manifest = "$target_gen_dir/shell_apk_manifest/AndroidManifest.xml"
 
 jinja_template("shell_apk_manifest") {
   input = "AndroidManifest.xml"
   output = shell_apk_manifest
 
   # The variable values must be non empty and globally unique in
   # AndroidManifest.xml in order for the string substitution in APKMinting.java
   # to work.
   variables = [
-    "manifest_package=$manifest_package_minting.$manifest_package_minting_origin",
+    "manifest_package=$manifest_package_webapk.$manifest_package_webapk_origin",
     "min_sdk_version=16",
     "target_sdk_version=23",
     "host_url=$host_url",
     "runtime_host=$runtime_host",
     "scope_url_host=$scope_url_host",
     "mac=$mac",
     "scope=$scope",
   ]
 }
 
 android_resources("shell_apk_resources") {
   resource_dirs = [ "res" ]
   custom_package = "org.chromium.webapk.shell_apk"
 }
 
 android_library("dex_loader_lib") {
   java_files = [ "src/org/chromium/webapk/shell_apk/DexLoader.java" ]
 }
 
 # Template for WebAPK. When a WebAPK is generated:
 # - Android manifest is customized to the website.
 # - App icon is extracted from the website and added to the APK's resources.
 android_apk("webapk") {
   android_manifest = shell_apk_manifest
-  apk_name = "WebApk.$manifest_package_minting_origin"
+  apk_name = "WebApk.$manifest_package_webapk_origin"
   native_lib_placeholders = [ "libfoo.so" ]
   java_files = [
     "src/org/chromium/webapk/shell_apk/MainActivity.java",
     "src/org/chromium/webapk/shell_apk/WebApkApplication.java",
     "src/org/chromium/webapk/shell_apk/WebApkServiceFactory.java",
     "src/org/chromium/webapk/shell_apk/Reflect.java",
   ]
   chromium_code = false
   proguard_enabled = true
   proguard_configs = [ "proguard.flags" ]
@@ skipping 10 matching lines @@
   java_files =
       [ "javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java" ]
   deps = [
     ":dex_loader_lib",
     "//base:base_java",
     "//content/public/test/android:content_java_test_support",
     "//webapk/libs/common",
   ]
   srcjar_deps = [ "javatests/dex_optimizer:dex_optimizer_service_aidl" ]
 }