[pull] master from googlevr:master

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hellocardboard-android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 35
         versionCode 1
-        versionName "1.30.0"
+        versionName "1.31.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'

hellocardboard-ios/HelloCardboard-Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.30.0</string>
+	<string>1.31.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.30.0</string>
+	<string>1.31.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

sdk/lens_distortion.cc

@@ -15,8 +15,12 @@
  */
 #include "lens_distortion.h"
 
+#include <algorithm>
+#include <array>
 #include <cmath>
 #include <cstring>
+#include <memory>
+#include <vector>
 
 #include "include/cardboard.h"
 #include "screen_params.h"

sdk/qrcode/android/qr_code.cc

@@ -19,6 +19,7 @@
 
 #include <array>
 #include <atomic>
+#include <cstring>
 
 #include "jni_utils/android/jni_utils.h"
 
@@ -148,7 +149,7 @@ void saveDeviceParams(const uint8_t* uri, int size) {
 
   // Copy the uint8_t* to a jbyteArray
   jbyte* java_data_ptr = env->GetByteArrayElements(uri_jbyte_array, 0);
-  memcpy(java_data_ptr, uri, size);
+  std::memcpy(java_data_ptr, uri, size);
   env->SetByteArrayRegion(uri_jbyte_array, 0, size, java_data_ptr);
 
   // Get the Java class method to be called

sdk/qrcode/ios/sdk.bundle/resolutions.csv

@@ -55,4 +55,9 @@ iPhone17.3,iPhone 16,460.0f
 iPhone17.4,iPhone 16 Plus,460.0f
 iPhone17.1,iPhone 16 Pro,460.0f
 iPhone17.2,iPhone 16 Pro Max,460.0f
+iPhone17.5,iPhone 16e,460.0f
+iPhone18.4,iPhone Air,460.0f
+iPhone18.3,iPhone 17,460.0f
+iPhone18.1,iPhone 17 Pro,460.0f
+iPhone18.2,iPhone 17 Pro Max,460.0f
 iPod9.1,iPod touch (7th generation),326.0f

sdk/rendering/android/vulkan_distortion_renderer.cc

@@ -553,8 +553,9 @@ class VulkanDistortionRenderer : public DistortionRenderer {
     PushConstantsObject push_constants{
         .left_u = eye_description->left_u,
         .right_u = eye_description->right_u,
-        .top_v = eye_description->top_v,
-        .bottom_v = eye_description->bottom_v,
+        .top_v = eye_description->bottom_v,  // Swap top and bottom to match the
+                                            // texture coordinates.
+        .bottom_v = eye_description->top_v,
     };
     vkCmdPushConstants(command_buffer, pipeline_layout_,
                        VK_SHADER_STAGE_VERTEX_BIT, 0,
@@ -612,10 +613,12 @@ class VulkanDistortionRenderer : public DistortionRenderer {
     vkUpdateDescriptorSets(logical_device_, 1, descriptor_writes, 0, nullptr);
 
     // Update Viewport and scissor
+    // Swap the height to make the viewport bottom-left origin as expected by
+    // the distortion mesh.
     VkViewport viewport = {.x = static_cast<float>(x),
-                           .y = static_cast<float>(y),
+                           .y = static_cast<float>(y + height),
                            .width = static_cast<float>(width),
-                           .height = static_cast<float>(height),
+                           .height = -static_cast<float>(height),
                            .minDepth = 0.0,
                            .maxDepth = 1.0};
 

sdk/sensors/accelerometer_data.h

@@ -16,6 +16,8 @@
 #ifndef CARDBOARD_SDK_SENSORS_ACCELEROMETER_DATA_H_
 #define CARDBOARD_SDK_SENSORS_ACCELEROMETER_DATA_H_
 
+#include <cstdint>
+
 #include "util/vector.h"
 
 namespace cardboard {

sdk/sensors/gyroscope_data.h

@@ -16,6 +16,8 @@
 #ifndef CARDBOARD_SDK_SENSORS_GYROSCOPE_DATA_H_
 #define CARDBOARD_SDK_SENSORS_GYROSCOPE_DATA_H_
 
+#include <cstdint>
+
 #include "util/vector.h"
 
 namespace cardboard {

sdk/sensors/lowpass_filter.h

@@ -17,6 +17,7 @@
 #define CARDBOARD_SDK_SENSORS_LOWPASS_FILTER_H_
 
 #include <array>
+#include <cstdint>
 #include <memory>
 
 #include "util/vector.h"