diff options
Diffstat (limited to 'chromium/third_party/gvr-android-sdk')
12 files changed, 64 insertions, 18 deletions
diff --git a/chromium/third_party/gvr-android-sdk/BUILD.gn b/chromium/third_party/gvr-android-sdk/BUILD.gn index 223ba74ba85..bc7e79ec590 100644 --- a/chromium/third_party/gvr-android-sdk/BUILD.gn +++ b/chromium/third_party/gvr-android-sdk/BUILD.gn @@ -7,12 +7,14 @@ import("//build/config/android/rules.gni") android_aar_prebuilt("controller_test_api_java") { aar_path = "test-libraries/controller_test_api.aar" proguard_configs = [ "test-libraries/proguard.txt" ] + + # Jar includes conflicting copies of Desugar-runtime.jar classes. + jar_excluded_patterns = [ "*ThrowableExtension*.class" ] } android_aar_prebuilt("gvr_common_java") { - aar_path = "common_library.aar" + aar_path = "src/libraries/sdk-common-1.80.0.aar" proguard_configs = [ "proguard-gvr-chromium.txt" ] - ignore_manifest = true # Ignored because manifest merging is not supported (http://crbug.com/643967) ignore_native_libraries = true # Ignore unused auto generated classes. Proguard will not strip them automatically because they @@ -37,11 +39,19 @@ android_aar_prebuilt("gvr_common_java") { "*google/common/logging/nano/Vr\$VREvent\$DoublePrecisionTransform.class", "*google/common/logging/nano/Vr\$VREvent\$Cyclops*.class", "*google/common/logging/nano/Vr\$VREvent\$AudioStats.class", + "*ThrowableExtension*.class", + ] + + deps = [ + "//third_party/android_protobuf:protobuf_nano_javalib", ] } android_aar_prebuilt("gvr_controller_java") { - aar_path = "src/libraries/sdk-controller-1.60.1.aar" + aar_path = "src/libraries/sdk-controller-1.80.0.aar" + deps = [ + ":gvr_common_java", + ] } config("libgvr_config") { diff --git a/chromium/third_party/gvr-android-sdk/README.chromium b/chromium/third_party/gvr-android-sdk/README.chromium index 47a8431faca..12aa13c3b82 100644 --- a/chromium/third_party/gvr-android-sdk/README.chromium +++ b/chromium/third_party/gvr-android-sdk/README.chromium @@ -1,9 +1,9 @@ Name: Google VR SDK Short Name: gvr URL: https://github.com/googlevr/gvr-android-sdk -Version: 1.60.1 -Date: 06 June 2017 -Revision: a27f768b13682189c23eed69656319db5ef7cbfc +Version: 1.80.0 +Date: 29 August 2017 +Revision: ee5cb1c6138d0be57e82ddafc1b54d7d3e3e5560 License: Apache 2.0 License File: LICENSE Security Critical: yes @@ -14,13 +14,9 @@ simple API used for creating apps inserted into Cardboard viewers, and the more complex API for supporting Daydream-ready phones and the Daydream controller. Local Modifications: -Only header files in NDK are used. Due to binary size concern, we have decided -to use a static shim library instead of the shared library that comes with -this checkout. The static libraries are downloaded from a public storage through -gclient sync. Currently, the static libraries needs a newer version of -common_library.aar than the one provided by this checkout. So we also download -it from the same public storage. Once the version on github catches up, we will -remove common_library.aar. +Due to binary size concern, we have decided to use a static shim library instead +of the shared library that comes with this checkout. The static libraries are +downloaded from a public storage through gclient sync. For Version 1.10.0, we have two date: 6 Dec 2016 and 10 Feb 2017. The latter version cherrypick a CL that fix a crash on K and L. All JNI calls in the static library also needs to be manually registered. So diff --git a/chromium/third_party/gvr-android-sdk/common_library.aar.sha1 b/chromium/third_party/gvr-android-sdk/common_library.aar.sha1 deleted file mode 100644 index ca06c1af3c8..00000000000 --- a/chromium/third_party/gvr-android-sdk/common_library.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2e65f66d39019f6c9be93c6cb28e2d434667daa5
\ No newline at end of file diff --git a/chromium/third_party/gvr-android-sdk/controller_test_api_java.info b/chromium/third_party/gvr-android-sdk/controller_test_api_java.info new file mode 100644 index 00000000000..a2ebd4a87ea --- /dev/null +++ b/chromium/third_party/gvr-android-sdk/controller_test_api_java.info @@ -0,0 +1,13 @@ +# Generated by //build/android/gyp/aar.py +# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen". + +aidl = [ ] +assets = [ ] +has_classes_jar = true +has_native_libraries = false +has_proguard_flags = false +has_r_text_file = false +is_manifest_empty = true +resources = [ ] +subjar_tuples = [ ] +subjars = [ ] diff --git a/chromium/third_party/gvr-android-sdk/gvr_common_java.info b/chromium/third_party/gvr-android-sdk/gvr_common_java.info new file mode 100644 index 00000000000..aacf1d974ae --- /dev/null +++ b/chromium/third_party/gvr-android-sdk/gvr_common_java.info @@ -0,0 +1,13 @@ +# Generated by //build/android/gyp/aar.py +# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen". + +aidl = [ ] +assets = [ ] +has_classes_jar = true +has_native_libraries = false +has_proguard_flags = false +has_r_text_file = true +is_manifest_empty = true +resources = [ "res/drawable-hdpi-v4/quantum_ic_close_white_24.png", "res/drawable-hdpi-v4/quantum_ic_settings_white_24.png", "res/drawable-hdpi-v4/transition.png", "res/drawable-mdpi-v4/quantum_ic_close_white_24.png", "res/drawable-mdpi-v4/quantum_ic_settings_white_24.png", "res/drawable-mdpi-v4/transition.png", "res/drawable-v21/rippleable.xml", "res/drawable-xhdpi-v4/quantum_ic_close_white_24.png", "res/drawable-xhdpi-v4/quantum_ic_settings_white_24.png", "res/drawable-xxhdpi-v4/quantum_ic_close_white_24.png", "res/drawable-xxhdpi-v4/quantum_ic_settings_white_24.png", "res/drawable-xxxhdpi-v4/quantum_ic_close_white_24.png", "res/drawable-xxxhdpi-v4/quantum_ic_settings_white_24.png", "res/drawable/rippleable.xml", "res/layout-land/back_button.xml", "res/layout-land/settings_button.xml", "res/layout-land/ui_layer_with_portrait_support.xml", "res/layout-ldrtl-land-v17/back_button.xml", "res/layout-ldrtl-land-v17/settings_button.xml", "res/layout-ldrtl-v17/back_button.xml", "res/layout-ldrtl-v17/settings_button.xml", "res/layout/back_button.xml", "res/layout/settings_button.xml", "res/layout/transition_view.xml", "res/layout/ui_layer.xml", "res/layout/ui_layer_with_portrait_support.xml", "res/values-ar/values.xml", "res/values-bg/values.xml", "res/values-ca/values.xml", "res/values-cs/values.xml", "res/values-da/values.xml", "res/values-de/values.xml", "res/values-el/values.xml", "res/values-en-rGB/values.xml", "res/values-es-rUS/values.xml", "res/values-es/values.xml", "res/values-fa/values.xml", "res/values-fi/values.xml", "res/values-fr-rCA/values.xml", "res/values-fr/values.xml", "res/values-hi/values.xml", "res/values-hr/values.xml", "res/values-hu/values.xml", "res/values-id/values.xml", "res/values-it/values.xml", "res/values-iw/values.xml", "res/values-ja/values.xml", "res/values-ko/values.xml", "res/values-land/values.xml", "res/values-lt/values.xml", "res/values-lv/values.xml", "res/values-nl/values.xml", "res/values-no/values.xml", "res/values-pl/values.xml", "res/values-pt-rBR/values.xml", "res/values-pt-rPT/values.xml", "res/values-ro/values.xml", "res/values-ru/values.xml", "res/values-sk/values.xml", "res/values-sl/values.xml", "res/values-sr/values.xml", "res/values-sv/values.xml", "res/values-th/values.xml", "res/values-tl/values.xml", "res/values-tr/values.xml", "res/values-uk/values.xml", "res/values-v19/values.xml", "res/values-v21/values.xml", "res/values-vi/values.xml", "res/values-zh-rCN/values.xml", "res/values-zh-rTW/values.xml", "res/values/values.xml" ] +subjar_tuples = [ ] +subjars = [ ] diff --git a/chromium/third_party/gvr-android-sdk/gvr_controller_java.info b/chromium/third_party/gvr-android-sdk/gvr_controller_java.info new file mode 100644 index 00000000000..a2ebd4a87ea --- /dev/null +++ b/chromium/third_party/gvr-android-sdk/gvr_controller_java.info @@ -0,0 +1,13 @@ +# Generated by //build/android/gyp/aar.py +# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen". + +aidl = [ ] +assets = [ ] +has_classes_jar = true +has_native_libraries = false +has_proguard_flags = false +has_r_text_file = false +is_manifest_empty = true +resources = [ ] +subjar_tuples = [ ] +subjars = [ ] diff --git a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1 b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1 index c31069058d3..13265b622e7 100644 --- a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1 +++ b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1 @@ -1 +1 @@ -a951bb4b47a6a250c2705cec4a772b606d1b39ae
\ No newline at end of file +9007b02cbd9dc0765e89e63d2ae4c66f8285832e
\ No newline at end of file diff --git a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1 b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1 index 51e10c70722..99d9898689d 100644 --- a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1 +++ b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1 @@ -1 +1 @@ -8536e70560ab4f3a3f4f93d9dd0fc639c898a4d7
\ No newline at end of file +7bca9dfff2a90393812852ce3b0c7d4c15d37cec
\ No newline at end of file diff --git a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt index 9200f48c245..f70d4aa60c5 100644 --- a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt +++ b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt @@ -7,3 +7,4 @@ v1.4 9afe32eb4676d4bcceae81605a3be6aa0e5be3d5 v1.5 a02e2f95aa6f741f2be0ae03a4829e21fd749cf3 v1.6 43b876df3398687dfa1ae059ef2f64009c76254e v1.7 d5c72438acffe723e7717c45deedd8431bc613e7 +v1.8 cbc81aa4db5986f25d2c967f9b1e247cf07cd75e diff --git a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1 b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1 index 31836cd7ed7..11fa641c7e5 100644 --- a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1 +++ b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1 @@ -1 +1 @@ -d5c72438acffe723e7717c45deedd8431bc613e7
\ No newline at end of file +cbc81aa4db5986f25d2c967f9b1e247cf07cd75e
\ No newline at end of file diff --git a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt index 4831ae618b0..2b7c0f5c200 100644 --- a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt +++ b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt @@ -10,3 +10,4 @@ v1.4 3e0cc24655847c7b922149754324a189e7092310 v1.5 5d6d55728c7c728cef5416f37b0b71615719474e v1.6 abcdae2281956a76aa3b98d2e8f05a1975170dd0 v1.7 fcfa178173a2c0cab9c7d51829c2ee76ab66e1d9 +v1.8 f8f45ebf1963c5f9862218baca120ea974b87a08 diff --git a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1 b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1 index fb682073a03..c4102cfa672 100644 --- a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1 +++ b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1 @@ -1 +1 @@ -fcfa178173a2c0cab9c7d51829c2ee76ab66e1d9
\ No newline at end of file +f8f45ebf1963c5f9862218baca120ea974b87a08
\ No newline at end of file |