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

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

Issue 2863733002: Remove uneeded enable_vr check (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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("//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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 111
112 generate_jni("vr_shell_jni_headers") { 112 generate_jni("vr_shell_jni_headers") {
113 sources = [ 113 sources = [
114 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDel egate.java", 114 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDel egate.java",
115 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImp l.java", 115 "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImp l.java",
116 ] 116 ]
117 jni_package = "vr_shell" 117 jni_package = "vr_shell"
118 } 118 }
119 } 119 }
120 120
121 if (enable_vr) { 121 test("vr_shell_unittests") {
122 test("vr_shell_unittests") { 122 sources = [
123 sources = [ 123 "fps_meter_unittest.cc",
124 "fps_meter_unittest.cc", 124 "gltf_parser_unittest.cc",
125 "gltf_parser_unittest.cc", 125 "test/paths.cc",
126 "test/paths.cc", 126 "test/paths.h",
127 "test/paths.h", 127 "ui_elements/ui_element_unittest.cc",
128 "ui_elements/ui_element_unittest.cc", 128 "ui_scene_manager_unittest.cc",
129 "ui_scene_manager_unittest.cc", 129 "ui_scene_unittest.cc",
130 "ui_scene_unittest.cc", 130 ]
131 ]
132 131
133 deps = [ 132 deps = [
134 ":vr_common", 133 ":vr_common",
135 "//base/test:run_all_unittests", 134 "//base/test:run_all_unittests",
136 "//base/test:test_support", 135 "//base/test:test_support",
137 "//chrome/browser", 136 "//chrome/browser",
138 "//testing/gmock", 137 "//testing/gmock",
139 "//testing/gtest", 138 "//testing/gtest",
140 "//third_party/WebKit/public:blink", 139 "//third_party/WebKit/public:blink",
141 "//ui/gfx/geometry", 140 "//ui/gfx/geometry",
142 ] 141 ]
143 142
144 # Ensure libgvr static library appears before gcc library in linking order. 143 # Ensure libgvr static library appears before gcc library in linking order.
145 # See https://crbug.com/704305 for details. 144 # See https://crbug.com/704305 for details.
146 libs = 145 libs = [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
147 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
148 146
149 data = [ 147 data = [
150 "test/data/sample_inline.gltf", 148 "test/data/sample_inline.gltf",
151 "test/data/sample_external.gltf", 149 "test/data/sample_external.gltf",
152 "test/data/sample.bin", 150 "test/data/sample.bin",
153 "test/data/sample.glb", 151 "test/data/sample.glb",
154 ] 152 ]
155 }
156 } 153 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698