| OLD | NEW | 
|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import("//build/config/android/rules.gni") | 5 import("//build/config/android/rules.gni") | 
| 6 import("//chrome/common/features.gni") | 6 import("//chrome/common/features.gni") | 
| 7 import("//device/vr/features/features.gni") | 7 import("//device/vr/features/features.gni") | 
| 8 import("//testing/test.gni") | 8 import("//testing/test.gni") | 
| 9 | 9 | 
| 10 assert(enable_vr) | 10 assert(enable_vr) | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 55       "ui_scene.h", | 55       "ui_scene.h", | 
| 56       "ui_scene_manager.cc", | 56       "ui_scene_manager.cc", | 
| 57       "ui_scene_manager.h", | 57       "ui_scene_manager.h", | 
| 58       "vr_browser_interface.h", | 58       "vr_browser_interface.h", | 
| 59       "vr_compositor.cc", | 59       "vr_compositor.cc", | 
| 60       "vr_compositor.h", | 60       "vr_compositor.h", | 
| 61       "vr_controller.cc", | 61       "vr_controller.cc", | 
| 62       "vr_controller.h", | 62       "vr_controller.h", | 
| 63       "vr_controller_model.cc", | 63       "vr_controller_model.cc", | 
| 64       "vr_controller_model.h", | 64       "vr_controller_model.h", | 
|  | 65       "vr_core_info.cc", | 
|  | 66       "vr_core_info.h", | 
| 65       "vr_gl_thread.cc", | 67       "vr_gl_thread.cc", | 
| 66       "vr_gl_thread.h", | 68       "vr_gl_thread.h", | 
| 67       "vr_gl_util.cc", | 69       "vr_gl_util.cc", | 
| 68       "vr_gl_util.h", | 70       "vr_gl_util.h", | 
| 69       "vr_input_manager.cc", | 71       "vr_input_manager.cc", | 
| 70       "vr_input_manager.h", | 72       "vr_input_manager.h", | 
|  | 73       "vr_metrics_util.cc", | 
|  | 74       "vr_metrics_util.h", | 
| 71       "vr_shell.cc", | 75       "vr_shell.cc", | 
| 72       "vr_shell.h", | 76       "vr_shell.h", | 
| 73       "vr_shell_delegate.cc", | 77       "vr_shell_delegate.cc", | 
| 74       "vr_shell_delegate.h", | 78       "vr_shell_delegate.h", | 
| 75       "vr_shell_gl.cc", | 79       "vr_shell_gl.cc", | 
| 76       "vr_shell_gl.h", | 80       "vr_shell_gl.h", | 
| 77       "vr_shell_renderer.cc", | 81       "vr_shell_renderer.cc", | 
| 78       "vr_shell_renderer.h", | 82       "vr_shell_renderer.h", | 
| 79       "vr_usage_monitor.cc", | 83       "vr_usage_monitor.cc", | 
| 80       "vr_usage_monitor.h", | 84       "vr_usage_monitor.h", | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 107     libs = [ | 111     libs = [ | 
| 108       "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", | 112       "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", | 
| 109       "android", | 113       "android", | 
| 110     ] | 114     ] | 
| 111 | 115 | 
| 112     configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] | 116     configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] | 
| 113   } | 117   } | 
| 114 | 118 | 
| 115   generate_jni("vr_shell_jni_headers") { | 119   generate_jni("vr_shell_jni_headers") { | 
| 116     sources = [ | 120     sources = [ | 
|  | 121       "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreInfo
     .java", | 
| 117       "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDel
     egate.java", | 122       "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDel
     egate.java", | 
| 118       "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImp
     l.java", | 123       "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImp
     l.java", | 
| 119     ] | 124     ] | 
| 120     jni_package = "vr_shell" | 125     jni_package = "vr_shell" | 
| 121   } | 126   } | 
| 122 } | 127 } | 
| 123 | 128 | 
| 124 test("vr_shell_unittests") { | 129 test("vr_shell_unittests") { | 
| 125   sources = [ | 130   sources = [ | 
| 126     "fps_meter_unittest.cc", | 131     "fps_meter_unittest.cc", | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 147   # See https://crbug.com/704305 for details. | 152   # See https://crbug.com/704305 for details. | 
| 148   libs = [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] | 153   libs = [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] | 
| 149 | 154 | 
| 150   data = [ | 155   data = [ | 
| 151     "test/data/sample_inline.gltf", | 156     "test/data/sample_inline.gltf", | 
| 152     "test/data/sample_external.gltf", | 157     "test/data/sample_external.gltf", | 
| 153     "test/data/sample.bin", | 158     "test/data/sample.bin", | 
| 154     "test/data/sample.glb", | 159     "test/data/sample.glb", | 
| 155   ] | 160   ] | 
| 156 } | 161 } | 
| OLD | NEW | 
|---|