[pull] master from googlevr:master

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.10.0'
         // 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.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hellocardboard-android/CMakeLists.txt

@@ -45,3 +45,6 @@ target_link_libraries(cardboard_jni
     ${GLESv3_LIB}
     ${LOG_LIB}
     ${CARDBOARD_LIB})
+
+target_link_options(cardboard_jni PRIVATE "-Wl,-z,max-page-size=16384")
+

hellocardboard-android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion = 26
         targetSdkVersion = 35
         versionCode 1
-        versionName "1.33.0"
+        versionName "1.34.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'
@@ -37,6 +37,11 @@ android {
         path "CMakeLists.txt"
     }
     namespace = 'com.google.cardboard'
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
@@ -52,8 +57,9 @@ dependencies {
 
 // The dependencies for NDK builds live inside the .aar files so they need to
 // be extracted before NDK targets can link against.
-task extractNdk(type: Copy)  {
-    if (file("${project.rootDir}/sdk/build/outputs/aar/sdk-release.aar").exists()) {
+task extractNdk {
+    dependsOn ':sdk:assembleRelease'
+    doLast {
         copy {
             from zipTree("${project.rootDir}/sdk/build/outputs/aar/sdk-release.aar")
             into "libraries/"
@@ -71,5 +77,5 @@ task deleteNdk(type: Delete) {
     delete "libraries/cardboard.h"
 }
 
-build.dependsOn(extractNdk)
+preBuild.dependsOn(extractNdk)
 clean.dependsOn(deleteNdk)

hellocardboard-ios/HelloCardboard-Info.plist

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

java_api/proguard-rules.pro

@@ -0,0 +1,6 @@
+# Proguard rules to preserve Cardboard OSS as a dependency.
+#
+# Because of native to and from Java calls, Java code is preserved.
+# TODO(b/266823260): Remove forked ProGuard file.
+-keep class com.google.cardboard.sdk.** { *; }
+-keep class com.google.cardboard.proto.** { *; }

java_api/src/main/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="%PACKAGE_NAME%">
+
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="35" />
+
+    <application/>
+</manifest>