Issue 6287 - Create codename Orca v.0 to launch internally to the team

chrome/android/chrome_public_apk_tmpl.gni

 # 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("//base/android/linker/config.gni")
 import("//build/config/android/rules.gni")
+import("//build/config/android/version.gni")
 import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 import("//third_party/leakcanary/config.gni")
 import("channel.gni")
 
 declare_args() {
   # Whether chrome_public_apk should use the crazy linker.
   chrome_public_apk_use_chromium_linker = chromium_linker_supported
 
   # Whether chrome_public_apk should use the relocation packer.
   chrome_public_apk_use_relocation_packer = chromium_linker_supported
 
   # Whether native libraries should be loaded from within the apk.
   # Only attempt loading the library from the APK for 64 bit devices
   # until the number of 32 bit devices which don't support this
   # approach falls to a minimal level -  http://crbug.com/390618.
   chrome_public_apk_load_library_from_apk =
       chromium_linker_supported &&
       (current_cpu == "arm64" || current_cpu == "x64")
 
   # Enables ProGuard obfuscation of Chromium packages.
   enable_proguard_obfuscation = false
 
   # Enables ProGuard obfuscation of chrome_public_test_apk.
   enable_proguard_obfuscation_for_tests = false
 
   # Enable multidex in release builds.
   multidex_in_release = false
+
+  # Set versionName for AndroidManifest.xml. See https://issues.adblockplus.org/ticket/6287
+  version_name = android_version_name
+
+  # Set versionCode for AndroidManifest.xml. See https://issues.adblockplus.org/ticket/6287
+  version_code = android_version_code
 }
 
 default_chrome_public_jinja_variables = [
   "channel=$android_channel",
   "enable_leakcanary=$enable_leakcanary",
   "enable_vr=$enable_vr",
 ]
 
 template("chrome_public_apk_tmpl") {
   android_apk(target_name) {
@@ skipping 100 matching lines @@
 
     if (!is_java_debug) {
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
       proguard_configs += [ "//android_webview/apk/java/proguard.flags" ]
       png_to_webp = true
     }
   }
 }