GVR SDK Android 1.160.0

Author: Noel Victor

README.md

@@ -11,4 +11,7 @@ For first time users, see the
 [Get Started with Google VR on Android](//developers.google.com/vr/android/get-started)
 guide.
 
+SDK releases are availble from the
+[releases](//github.com/googlevr/gvr-android-sdk/releases) page.
+
 Please note, we do not accept pull requests.

apks/controller_emulator.apk

@@ -35,13 +35,13 @@ task clean(type: Delete) {
 // The dependencies for NDK builds live inside the .aar files so they need to
 // be extracted before NDK targets can build.
 task extractAudioSo(type: Copy) {
-    from zipTree("${project.rootDir}/libraries/sdk-audio-1.150.0.aar")
+    from zipTree("${project.rootDir}/libraries/sdk-audio-1.160.0.aar")
     into "${project.rootDir}/libraries/"
     include "jni/**/libgvr_audio.so"
 }
 
 task extractGvrSo(type: Copy) {
-    from zipTree("${project.rootDir}/libraries/sdk-base-1.150.0.aar")
+    from zipTree("${project.rootDir}/libraries/sdk-base-1.160.0.aar")
     into "${project.rootDir}/libraries/"
     include "jni/**/libgvr.so"
 }

build.gradle

@@ -23,14 +23,14 @@ extern "C" {
 /// A string representation of the current GVR build version. This is of
 /// the form "MAJOR.MINOR.PATCH". Note that this may differ from the runtime
 /// GVR version as reported by gvr_get_version_string().
-#define GVR_SDK_VERSION_STRING "1.150.0"
+#define GVR_SDK_VERSION_STRING "1.160.0"
 
 /// Semantic components for the current GVR build version. Note that these
 /// values may differ from the runtime GVR version as reported by
 /// gvr_get_version().
 enum {
   GVR_SDK_MAJOR_VERSION = 1,
-  GVR_SDK_MINOR_VERSION = 150,
+  GVR_SDK_MINOR_VERSION = 160,
   GVR_SDK_PATCH_VERSION = 0,
 };
 

libraries/headers/vr/gvr/capi/include/gvr_version.h

@@ -4,7 +4,7 @@
 
   <groupId>com.google.vr</groupId>
   <artifactId>sdk-audio</artifactId>
-  <version>1.150.0</version>
+  <version>1.160.0</version>
   <packaging>aar</packaging>
 
   <name>Google VR SDK-Audio</name>
@@ -19,7 +19,7 @@
       <groupId>com.google.vr</groupId>
       <artifactId>sdk-base</artifactId>
       <type>aar</type>
-      <version>1.150.0</version>
+      <version>1.160.0</version>
     </dependency>
   </dependencies>
 </project>

libraries/sdk-audio-1.150.0.aar

@@ -4,7 +4,7 @@
 
   <groupId>com.google.vr</groupId>
   <artifactId>sdk-base</artifactId>
-  <version>1.150.0</version>
+  <version>1.160.0</version>
   <packaging>aar</packaging>
 
   <name>Google VR SDK-Base</name>
@@ -19,7 +19,7 @@
       <groupId>com.google.vr</groupId>
       <artifactId>sdk-common</artifactId>
       <type>aar</type>
-      <version>1.150.0</version>
+      <version>1.160.0</version>
     </dependency>
   </dependencies>
 </project>

libraries/sdk-audio-1.160.0.aar

@@ -4,7 +4,7 @@
 
   <groupId>com.google.vr</groupId>
   <artifactId>sdk-common</artifactId>
-  <version>1.150.0</version>
+  <version>1.160.0</version>
   <packaging>aar</packaging>
 
   <name>Google VR SDK-Common</name>

libraries/sdk-audio-1.150.0.pom renamed to libraries/sdk-audio-1.160.0.pom

@@ -4,7 +4,7 @@
 
   <groupId>com.google.vr</groupId>
   <artifactId>sdk-commonwidget</artifactId>
-  <version>1.150.0</version>
+  <version>1.160.0</version>
   <packaging>aar</packaging>
 
   <name>Google VR SDK-CommonWidget</name>
@@ -19,7 +19,7 @@
       <groupId>com.google.vr</groupId>
       <artifactId>sdk-common</artifactId>
       <type>aar</type>
-      <version>1.150.0</version>
+      <version>1.160.0</version>
     </dependency>
   </dependencies>
 </project>

libraries/sdk-base-1.150.0.aar

@@ -4,7 +4,7 @@
 
   <groupId>com.google.vr</groupId>
   <artifactId>sdk-controller</artifactId>
-  <version>1.150.0</version>
+  <version>1.160.0</version>
   <packaging>aar</packaging>
 
   <name>Google VR SDK-Controller</name>
@@ -19,7 +19,7 @@
       <groupId>com.google.vr</groupId>
       <artifactId>sdk-base</artifactId>
       <type>aar</type>
-      <version>1.150.0</version>
+      <version>1.160.0</version>
     </dependency>
   </dependencies>
 </project>

libraries/sdk-base-1.160.0.aar

@@ -4,7 +4,7 @@
 
   <groupId>com.google.vr</groupId>
   <artifactId>sdk-panowidget</artifactId>
-  <version>1.150.0</version>
+  <version>1.160.0</version>
   <packaging>aar</packaging>
 
   <name>Google VR SDK-CommonWidget</name>
@@ -19,7 +19,7 @@
       <groupId>com.google.vr</groupId>
       <artifactId>sdk-commonwidget</artifactId>
       <type>aar</type>
-      <version>1.150.0</version>
+      <version>1.160.0</version>
     </dependency>
   </dependencies>
 </project>

libraries/sdk-base-1.150.0.pom renamed to libraries/sdk-base-1.160.0.pom

@@ -4,7 +4,7 @@
 
   <groupId>com.google.vr</groupId>
   <artifactId>sdk-videowidget</artifactId>
-  <version>1.150.0</version>
+  <version>1.160.0</version>
   <packaging>aar</packaging>
 
   <name>Google VR SDK-CommonWidget</name>
@@ -32,7 +32,7 @@
       <groupId>com.google.vr</groupId>
       <artifactId>sdk-commonwidget</artifactId>
       <type>aar</type>
-      <version>1.150.0</version>
+      <version>1.160.0</version>
     </dependency>
   </dependencies>
 </project>

libraries/sdk-common-1.150.0.aar

@@ -42,7 +42,7 @@ android {
 
 
 dependencies {
-    compile 'com.google.vr:sdk-base:1.150.0'
+    compile 'com.google.vr:sdk-base:1.160.0'
 }
 
 build.dependsOn(':extractNdk')

libraries/sdk-common-1.160.0.aar

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.google.vr.ndk.samples.controllerpaint"
-      android:versionCode="180423014"
-      android:versionName="1.150.0">
+      android:versionCode="180604046"
+      android:versionName="1.160.0">
 
   <!-- The Daydream SDK requires API 24+ and OpenGL ES 3.2+. -->
   <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24" />
@@ -40,7 +40,7 @@
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:screenOrientation="landscape"
-        android:configChanges="orientation|keyboardHidden|screenSize|uiMode|navigation"
+        android:configChanges="orientation|keyboardHidden|screenSize|uiMode|navigation|density"
         android:enableVrMode="@string/gvr_vr_mode_component"
         android:resizeableActivity="false">
 

libraries/sdk-common-1.150.0.pom renamed to libraries/sdk-common-1.160.0.pom

@@ -0,0 +1,39 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Configure the sample code.
+file(GLOB native_srcs "src/main/jni/*.cc")
+add_library(hellovr_jni
+    SHARED
+    ${native_srcs})
+
+# Include the GVR headers & libraries.
+include_directories(${GVR_INCLUDE})
+
+add_library(gvr-lib SHARED IMPORTED)
+set_target_properties(
+    gvr-lib
+    PROPERTIES IMPORTED_LOCATION ${GVR_LIBPATH}/${ANDROID_ABI}/libgvr.so)
+
+add_library(gvraudio-lib SHARED IMPORTED)
+set_target_properties(
+    gvraudio-lib
+    PROPERTIES IMPORTED_LOCATION ${GVR_LIBPATH}/${ANDROID_ABI}/libgvr_audio.so)
+
+# Include general Android libraries.
+find_library(android-lib android)
+find_library(EGL-lib EGL)
+find_library(GLESv2-lib GLESv2)
+find_library(log-lib log)
+
+# Build final libhellovr_jni.so
+target_link_libraries(hellovr_jni
+    gvr-lib
+    gvraudio-lib
+
+    ${android-lib}
+    ${EGL-lib}
+    ${GLESv2-lib}
+    ${log-lib} )

libraries/sdk-commonwidget-1.150.0.aar renamed to libraries/sdk-commonwidget-1.160.0.aar

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2018 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 26
+    defaultConfig {
+        applicationId "com.google.vr.ndk.samples.hellovr"
+        minSdkVersion 19
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=gnu++11"
+                arguments "-DGVR_LIBPATH=${project.rootDir}/libraries/jni",
+                          "-DGVR_INCLUDE=${project.rootDir}/libraries/headers"
+            }
+        }
+        buildTypes {
+            release {
+                minifyEnabled = true
+                proguardFiles.add(file("${project.rootDir}/proguard-gvr.txt"))
+            }
+        }
+        ndk {
+            // This sample builds all architectures by default. Note that if you
+            // only want to build for a specific architecture, you need to
+            // remove the appropriate lines below. You also need to remove the
+            // .so files from the apk using
+            // "packagingOptions {exclude('lib/armeabi-v7a/*')}" in the android
+            // section.
+            abiFilters "arm64-v8a"
+            abiFilters "armeabi-v7a"
+            abiFilters "x86"
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+}
+
+
+dependencies {
+    compile 'com.google.vr:sdk-audio:1.160.0'
+    compile 'com.google.vr:sdk-base:1.160.0'
+}
+
+build.dependsOn(':extractNdk')

libraries/sdk-commonwidget-1.150.0.pom renamed to libraries/sdk-commonwidget-1.160.0.pom

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.vr.ndk.samples.hellovr"
+    android:versionCode="180604046"
+    android:versionName="1.160.0">
+
+  <!-- The GVR SDK requires API 19+ and OpenGL ES 2+. -->
+  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
+  <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+
+  <!-- Required for vibration feedback when the trigger action is performed. -->
+  <uses-permission android:name="android.permission.VIBRATE"/>
+  <!-- Required to read the paired viewer's distortion parameters. -->
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+  <!-- Make accelerometer and gyroscope hard requirements for good head tracking. -->
+  <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
+  <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true"/>
+
+  <!-- Indicates use of Android's VR-mode, available only on Android N+. -->
+  <uses-feature android:name="android.software.vr.mode" android:required="false"/>
+  <!-- Indicates use of VR features that are available only on Daydream-ready devices. -->
+  <uses-feature android:name="android.hardware.vr.high_performance" android:required="false"/>
+
+  <!-- Indicates that head tracking should be done in 6DoF, if available -->
+  <uses-feature
+      android:name="android.hardware.vr.headtracking"
+      android:version="1"
+      android:required="false"/>
+
+  <application
+      android:allowBackup="true"
+      android:label="HelloVrActivity"
+      android:theme="@style/VrActivityTheme"
+      android:icon="@drawable/ic_launcher_hello_vr_round">
+    <activity
+        android:name=".HelloVrActivity"
+        android:label="@string/app_name"
+        android:screenOrientation="landscape"
+        android:configChanges="orientation|keyboardHidden|screenSize|uiMode|navigation|density"
+        android:enableVrMode="@string/gvr_vr_mode_component"
+        android:resizeableActivity="false">
+
+      <!-- The VR icon to be used in Daydream Home comes in two parts:
+           a foreground icon and a background icon.  -->
+      <meta-data android:name="com.google.android.vr.icon"
+                 android:resource="@drawable/hello_vr_icon_front" />
+      <meta-data android:name="com.google.android.vr.icon_background"
+                 android:resource="@drawable/hello_vr_icon_back" />
+
+      <!-- Intent filter that enables this app to be launched from the
+           Daydream Home menu. -->
+      <intent-filter>
+          <action android:name="android.intent.action.MAIN" />
+          <category android:name="android.intent.category.LAUNCHER" />
+          <category android:name="com.google.intent.category.DAYDREAM"/>
+      </intent-filter>
+
+      <!-- Intent filter that enables this app to be launched from the
+           Cardboard app and from the traditional launcher. -->
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="com.google.intent.category.CARDBOARD" />
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>