Update GVR to 1.101.1

Bug: 762018
Change-Id: I51b9890df2ec4cde768bd08f2e6d5ed54eca999a
Reviewed-on: https://chromium-review.googlesource.com/769737Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Commit-Queue: Biao She <bshe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517136}

DEPS

@@ -381,7 +381,7 @@ deps = {
   },
 
   'src/third_party/gvr-android-sdk/src': {
-      'url': Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + 'ee5cb1c6138d0be57e82ddafc1b54d7d3e3e5560',
+      'url': Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + '6aef4ab34276aac81ee38f1cb1d034de7fc4a4eb',
       'condition': 'checkout_android',
   },
 

chrome/android/static_initializers.gni

@@ -13,7 +13,7 @@ if (current_toolchain == default_toolchain &&
     (!is_debug && !using_sanitizer && proprietary_codecs)) {
   # Define expectations only for target_cpu covered by trybots.
   if (target_cpu == "arm") {
-    expected_static_initializer_count = 11
+    expected_static_initializer_count = 7
   } else if (target_cpu == "arm64") {
     expected_static_initializer_count = 3
   }

third_party/gvr-android-sdk/BUILD.gn

@@ -13,8 +13,11 @@ android_aar_prebuilt("controller_test_api_java") {
 }
 
 android_aar_prebuilt("gvr_common_java") {
-  aar_path = "src/libraries/sdk-common-1.80.0.aar"
-  proguard_configs = [ "proguard-gvr-chromium.txt" ]
+  aar_path = "src/libraries/sdk-common-1.101.0.aar"
+  proguard_configs = [
+    "src/proguard-gvr.txt",
+    "proguard-gvr-chromium.txt",
+  ]
   ignore_native_libraries = true
 
   # Ignore unused auto generated classes. Proguard will not strip them automatically because they
@@ -48,7 +51,7 @@ android_aar_prebuilt("gvr_common_java") {
 }
 
 android_aar_prebuilt("gvr_controller_java") {
-  aar_path = "src/libraries/sdk-controller-1.80.0.aar"
+  aar_path = "src/libraries/sdk-controller-1.101.0.aar"
   deps = [
     ":gvr_common_java",
   ]

third_party/gvr-android-sdk/README.chromium

 Name: Google VR SDK
 Short Name: gvr
 URL: https://github.com/googlevr/gvr-android-sdk
-Version: 1.80.0
-Date: 29 August 2017
-Revision: ee5cb1c6138d0be57e82ddafc1b54d7d3e3e5560
+Version: 1.101.0
+Date: 13 November 2017
+Revision: 6aef4ab34276aac81ee38f1cb1d034de7fc4a4eb
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes

third_party/gvr-android-sdk/gvr_api_jni.h

@@ -371,6 +371,10 @@ JNI_GENERATOR_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeUsingDynamicLibrary(JNIEnv* env,
                                                              jclass jcaller);
 
+JNI_GENERATOR_EXPORT jboolean
+Java_com_google_vr_ndk_base_GvrApi_nativeUsingShimLibrary(JNIEnv* env,
+                                                          jclass jcaller);
+
 JNI_GENERATOR_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetApplicationState(JNIEnv* env,
                                                              jclass jcaller,
@@ -1091,6 +1095,12 @@ static const JNINativeMethod kMethodsGvrApi[] = {
      "Z",
      reinterpret_cast<void*>(
          Java_com_google_vr_ndk_base_GvrApi_nativeUsingDynamicLibrary)},
+    {"nativeUsingShimLibrary",
+     "("
+     ")"
+     "Z",
+     reinterpret_cast<void*>(
+         Java_com_google_vr_ndk_base_GvrApi_nativeUsingShimLibrary)},
     {"nativeSetApplicationState",
      "("
      "Ljava/lang/ClassLoader;"

third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1

-9007b02cbd9dc0765e89e63d2ae4c66f8285832e
\ No newline at end of file
+7f208c50d6dc088518f2f500da75279819ca269d
\ No newline at end of file

third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1

-7bca9dfff2a90393812852ce3b0c7d4c15d37cec
\ No newline at end of file
+fb9082fa0b1a907543c11c45b7e873f8e843f2e3
\ No newline at end of file

third_party/gvr-android-sdk/native_callbacks_jni.h

@@ -51,7 +51,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleStateChanged(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
-    jint controllerId,
+    jint controllerIndex,
     jint newState);
 
 JNI_GENERATOR_EXPORT void
@@ -59,6 +59,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleControllerRecentere
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
+    jint controllerIndex,
     jlong timestampNanos,
     jfloat qx,
     jfloat qy,
@@ -70,6 +71,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleTouchEvent(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
+    jint controllerIndex,
     jlong timestampNanos,
     jint action,
     jfloat x,
@@ -80,6 +82,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleOrientationEvent(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
+    jint controllerIndex,
     jlong timestampNanos,
     jfloat qx,
     jfloat qy,
@@ -91,6 +94,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleButtonEvent(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
+    jint controllerIndex,
     jlong timestampNanos,
     jint buttonCode,
     jboolean down);
@@ -100,6 +104,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleAccelEvent(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
+    jint controllerIndex,
     jlong timestampNanos,
     jfloat x,
     jfloat y,
@@ -110,11 +115,33 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleGyroEvent(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
+    jint controllerIndex,
     jlong timestampNanos,
     jfloat x,
     jfloat y,
     jfloat z);
 
+JNI_GENERATOR_EXPORT void
+Java_com_google_vr_internal_controller_NativeCallbacks_handlePositionEvent(
+    JNIEnv* env,
+    jobject jcaller,
+    jlong userData,
+    jint controllerIndex,
+    jlong timestampNanos,
+    jfloat x,
+    jfloat y,
+    jfloat z);
+
+JNI_GENERATOR_EXPORT void
+Java_com_google_vr_internal_controller_NativeCallbacks_handleBatteryEvent(
+    JNIEnv* env,
+    jobject jcaller,
+    jlong userData,
+    jint controllerIndex,
+    jlong timestampNanos,
+    jboolean isCharging,
+    jint batteryLevelBucket);
+
 JNI_GENERATOR_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceInitFailed(
     JNIEnv* env,
@@ -147,25 +174,6 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceDisconnected
     jobject jcaller,
     jlong userData);
 
-JNI_GENERATOR_EXPORT void
-Java_com_google_vr_internal_controller_NativeCallbacks_handlePositionEvent(
-    JNIEnv* env,
-    jobject jcaller,
-    jlong userData,
-    jlong timestampNanos,
-    jfloat x,
-    jfloat y,
-    jfloat z);
-
-JNI_GENERATOR_EXPORT void
-Java_com_google_vr_internal_controller_NativeCallbacks_handleBatteryEvent(
-    JNIEnv* env,
-    jobject jcaller,
-    jlong userData,
-    jlong timestampNanos,
-    jboolean isCharging,
-    jint batteryLevelBucket);
-
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsNativeCallbacks[] = {
@@ -181,6 +189,7 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
     {"handleControllerRecentered",
      "("
      "J"
+     "I"
      "J"
      "F"
      "F"
@@ -193,6 +202,7 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
     {"handleTouchEvent",
      "("
      "J"
+     "I"
      "J"
      "I"
      "F"
@@ -204,6 +214,7 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
     {"handleOrientationEvent",
      "("
      "J"
+     "I"
      "J"
      "F"
      "F"
@@ -216,6 +227,7 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
     {"handleButtonEvent",
      "("
      "J"
+     "I"
      "J"
      "I"
      "Z"
@@ -226,6 +238,7 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
     {"handleAccelEvent",
      "("
      "J"
+     "I"
      "J"
      "F"
      "F"
@@ -237,6 +250,7 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
     {"handleGyroEvent",
      "("
      "J"
+     "I"
      "J"
      "F"
      "F"
@@ -245,6 +259,29 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
      "V",
      reinterpret_cast<void*>(
          Java_com_google_vr_internal_controller_NativeCallbacks_handleGyroEvent)},
+    {"handlePositionEvent",
+     "("
+     "J"
+     "I"
+     "J"
+     "F"
+     "F"
+     "F"
+     ")"
+     "V",
+     reinterpret_cast<void*>(
+         Java_com_google_vr_internal_controller_NativeCallbacks_handlePositionEvent)},
+    {"handleBatteryEvent",
+     "("
+     "J"
+     "I"
+     "J"
+     "Z"
+     "I"
+     ")"
+     "V",
+     reinterpret_cast<void*>(
+         Java_com_google_vr_internal_controller_NativeCallbacks_handleBatteryEvent)},
     {"handleServiceInitFailed",
      "("
      "J"
@@ -282,27 +319,6 @@ static const JNINativeMethod kMethodsNativeCallbacks[] = {
      "V",
      reinterpret_cast<void*>(
          Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceDisconnected)},
-    {"handlePositionEvent",
-     "("
-     "J"
-     "J"
-     "F"
-     "F"
-     "F"
-     ")"
-     "V",
-     reinterpret_cast<void*>(
-         Java_com_google_vr_internal_controller_NativeCallbacks_handlePositionEvent)},
-    {"handleBatteryEvent",
-     "("
-     "J"
-     "J"
-     "Z"
-     "I"
-     ")"
-     "V",
-     reinterpret_cast<void*>(
-         Java_com_google_vr_internal_controller_NativeCallbacks_handleBatteryEvent)},
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {

third_party/gvr-android-sdk/proguard-gvr-chromium.txt

-# Don't obfuscate any NDK/SDK code. This makes the debugging of stack traces in
-# in release builds easier.
--keepnames class com.google.vr.ndk.** { *; }
--keepnames class com.google.vr.sdk.** { *; }
-
-# These are part of the Java <-> native interfaces for GVR.
--keepclasseswithmembernames,includedescriptorclasses class com.google.vr.** {
-    native <methods>;
-}
-
--keep class com.google.vr.cardboard.UsedByNative
--keep @com.google.vr.cardboard.UsedByNative class *
--keepclassmembers class * {
-    @com.google.vr.cardboard.UsedByNative *;
-}
-
--keep class com.google.vr.cardboard.annotations.UsedByNative
--keep @com.google.vr.cardboard.annotations.UsedByNative class *
--keepclassmembers class * {
-    @com.google.vr.cardboard.annotations.UsedByNative *;
-}
-
--keep class com.google.vr.cardboard.annotations.UsedByReflection
--keep @com.google.vr.cardboard.annotations.UsedByReflection class *
--keepclassmembers class * {
-    @com.google.vr.cardboard.annotations.UsedByReflection *;
-}
-
-# All the above is copied from src/proguard-gvr.txt.
-# Chromium needs the following line to be able to exclude some unused auto generated classes.
 -dontwarn com.google.common.logging.nano.Vr$**

third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt

@@ -12,3 +12,4 @@ v1.6 abcdae2281956a76aa3b98d2e8f05a1975170dd0
 v1.7 fcfa178173a2c0cab9c7d51829c2ee76ab66e1d9
 v1.8 f8f45ebf1963c5f9862218baca120ea974b87a08
 v1.10 d288911f89f70a459b9fae4720bd3c2ecea26920
+v1.101 6bb3d2b3bc098a60ed255d74d904157fb223df8d

third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1

-d288911f89f70a459b9fae4720bd3c2ecea26920
\ No newline at end of file
+6bb3d2b3bc098a60ed255d74d904157fb223df8d