Introduce ChromeVR to Chrome on Android (behind a build flag)

chrome/android/BUILD.gn

 # Copyright 2014 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/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
@@ skipping 230 matching lines @@
       "//components/navigation_interception/android:navigation_interception_java",
       "//components/ntp_tiles/android:ntp_tiles_java",
       "//components/policy/android:policy_java",
       "//components/precache/android:precache_java",
       "//components/safe_json/android:safe_json_java",
       "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
       "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     ]
   }
+
+  if (enable_vr_shell) {
+    java_files += chrome_vr_java_sources
+    deps += [
+      "//third_party/gvr-android-sdk:gvr_base_java",
+      "//third_party/gvr-android-sdk:gvr_common_java",
+    ]
+  }
 }
 
 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java
 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java
 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java
 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java
 
 action("chrome_android_java_google_api_keys_srcjar") {
@@ skipping 284 matching lines @@
 }
 
 chrome_public_apk_tmpl_shared("chrome_public_apk") {
   android_manifest = get_target_outputs(":chrome_public_apk_manifest")
   android_manifest = android_manifest[1]
   android_manifest_dep = ":chrome_public_apk_manifest"
   apk_name = "ChromePublic"
   shared_libraries = [ ":chrome" ]
 
   deps = []
+
+  if (enable_vr_shell) {

[bajones, 2016/08/19 17:29:42]

This block won't be necessary once https://codereview.chromium.org/2219203002/
(re)lands

[bshe, 2016/08/19 21:05:10]

yeap. Will rebase once your cl landed and thanks for pave the way for using Gvr
library in chrome!!

+    deps += [ "//third_party/gvr-android-sdk:libgvr_shared_library" ]
+    loadable_modules = [ "$root_out_dir/libgvr.so" ]
+  }
 }
 
 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
   testonly = true
   android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest")
   android_manifest = android_manifest[1]
   android_manifest_dep = ":chrome_sync_shell_apk_manifest"
   apk_name = "ChromeSyncShell"
   shared_libraries = [ ":chrome_sync_shell" ]
 
@@ skipping 75 matching lines @@
 instrumentation_test_apk("chrome_sync_shell_test_apk") {
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
   ]
   proguard_enabled = !is_java_debug
 }