Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Side by Side Diff: chrome/browser/android/vr_shell/BUILD.gn

Issue 2399533002: Pull in vr_shell code for webvr (Closed)
Patch Set: review Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 assert(enable_vr_shell && android_java_ui) 9 assert(enable_vr_shell || enable_webvr)
10 10
11 static_library("vr_shell") { 11 static_library("vr_common") {
12 sources = [ 12 sources = [
13 "animation.cc", 13 "animation.cc",
14 "animation.h", 14 "animation.h",
15 "easing.cc", 15 "easing.cc",
16 "easing.h", 16 "easing.h",
17 "ui_elements.cc", 17 "ui_elements.cc",
18 "ui_elements.h", 18 "ui_elements.h",
19 "ui_scene.cc", 19 "ui_scene.cc",
20 "ui_scene.h", 20 "ui_scene.h",
21 "vr_compositor.cc", 21 "vr_compositor.cc",
(...skipping 25 matching lines...) Expand all
47 "//third_party/gvr-android-sdk:libgvr", 47 "//third_party/gvr-android-sdk:libgvr",
48 "//ui/android", 48 "//ui/android",
49 "//ui/base", 49 "//ui/base",
50 "//ui/gl", 50 "//ui/gl",
51 "//ui/gl/init", 51 "//ui/gl/init",
52 ] 52 ]
53 53
54 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] 54 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
55 } 55 }
56 56
57 generate_jni("vr_shell_jni_headers") { 57 generate_jni("vr_shell_jni_headers") {
agrieve 2016/10/07 17:36:43 nit: put this and vr_shell_unittests behind if (en
bshe 2016/10/07 20:36:22 webvr also needs jni headers so I probably can't d
58 sources = [ 58 sources = [
59 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java ", 59 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java ",
60 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDeleg ate.java", 60 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDeleg ate.java",
61 ] 61 ]
62 jni_package = "vr_shell" 62 jni_package = "vr_shell"
63 } 63 }
64 64
65 test("vr_shell_unittests") { 65 test("vr_shell_unittests") {
66 sources = [ 66 sources = [
67 "ui_elements_unittest.cc", 67 "ui_elements_unittest.cc",
68 "ui_scene_unittest.cc", 68 "ui_scene_unittest.cc",
69 ] 69 ]
70 70
71 deps = [ 71 deps = [
72 ":vr_shell", 72 ":vr_common",
73 "//base/test:run_all_unittests", 73 "//base/test:run_all_unittests",
74 "//base/test:test_support", 74 "//base/test:test_support",
75 "//testing/gtest", 75 "//testing/gtest",
76 "//ui/gfx/geometry", 76 "//ui/gfx/geometry",
77 ] 77 ]
78 } 78 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698