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

Unified Diff: device/vr/BUILD.gn

Issue 2662583003: Clean up device/vr BUILD file. (Closed)
Patch Set: Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/vr/BUILD.gn
diff --git a/device/vr/BUILD.gn b/device/vr/BUILD.gn
index 1420d6e6ecb2328a24967e4d07a9082c89d65f72..622258f0e92ca2c88879ca905874870cb3c673cb 100644
--- a/device/vr/BUILD.gn
+++ b/device/vr/BUILD.gn
@@ -9,11 +9,25 @@ if (is_android) {
import("//build/config/android/rules.gni") # For generate_jni().
}
-if (enable_webvr) {
- component("vr") {
- output_name = "device_vr"
+component("vr") {
+ output_name = "device_vr"
- sources = [
+ sources = [
+ "vr_export.h",
+ ]
+ defines = [ "DEVICE_VR_IMPLEMENTATION" ]
+ deps = [
+ ":mojo_bindings",
+ ]
+
+ if (!enable_webvr) {
+ sources += [
+ # We need to include an empty .cc file so that mac and windows don't fall over when trying to
+ # compile this when webvr is disabled.
+ "empty.cc",
+ ]
+ } else {
+ sources += [
"vr_device.cc",
"vr_device.h",
"vr_device_manager.cc",
@@ -26,14 +40,12 @@ if (enable_webvr) {
"vr_service_impl.h",
]
- deps = [
- ":mojo_bindings",
+ deps += [
"//base",
"//mojo/public/cpp/bindings",
"//ui/gfx",
]
- defines = [ "DEVICE_VR_IMPLEMENTATION" ]
if (is_android && (current_cpu == "arm" || current_cpu == "arm64")) {
sources += [
"android/gvr/gvr_delegate.cc",
@@ -55,7 +67,9 @@ if (enable_webvr) {
configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
}
}
+}
+if (enable_webvr) {
static_library("fakes") {
testonly = true
@@ -77,19 +91,6 @@ if (enable_webvr) {
"//mojo/public/cpp/bindings",
]
}
-} else {
- component("mojo_only") {
- sources = [
- # We need to include an empty .cc file so that mac and windows don't fall over when trying to
- # compile this.
- "empty.cc",
- "vr_export.h",
- ]
- defines = [ "DEVICE_VR_IMPLEMENTATION" ]
- public_deps = [
- ":mojo_bindings",
- ]
- }
}
mojom("mojo_bindings") {
« no previous file with comments | « content/renderer/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698