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

Unified Diff: device/vr/BUILD.gn

Issue 2840563004: Move vr features.gni into its own directory. (Closed)
Patch Set: Update references to vr/features.h Created 3 years, 8 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 | « device/BUILD.gn ('k') | device/vr/features.gni » ('j') | 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 66f5c096d16a34e62c0e2609eb64a7c63229cba3..a1ed8c43d9aaf91cfe5bf21505f731bb7314328f 100644
--- a/device/vr/BUILD.gn
+++ b/device/vr/BUILD.gn
@@ -2,23 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("features.gni")
-import("//build/buildflag_header.gni")
+import("features/features.gni")
import("//mojo/public/tools/bindings/mojom.gni")
if (is_android) {
import("//build/config/android/rules.gni") # For generate_jni().
}
-# Generate a buildflag header for compile-time checking of WebVR support.
-buildflag_header("features") {
- header = "features.h"
- flags = [
- "ENABLE_VR=$enable_vr",
- "ENABLE_OPENVR=$enable_openvr",
- ]
-}
-
component("vr") {
output_name = "device_vr"
@@ -27,11 +17,9 @@ component("vr") {
]
defines = [ "DEVICE_VR_IMPLEMENTATION" ]
deps = [
- ":features",
+ ":mojo_bindings",
+ "features",
]
- if (!is_ios) {
- deps += [ ":mojo_bindings" ]
- }
if (!enable_vr) {
sources += [
@@ -128,19 +116,17 @@ if (enable_vr) {
}
}
-if (!is_ios) {
- mojom("mojo_bindings") {
- sources = [
- "vr_service.mojom",
- ]
+mojom("mojo_bindings") {
+ sources = [
+ "vr_service.mojom",
+ ]
- public_deps = [
- "//gpu/ipc/common:interfaces",
- "//mojo/common:common_custom_types",
- ]
+ public_deps = [
+ "//gpu/ipc/common:interfaces",
+ "//mojo/common:common_custom_types",
+ ]
- export_class_attribute = "DEVICE_VR_EXPORT"
- export_define = "DEVICE_VR_IMPLEMENTATION=1"
- export_header = "device/vr/vr_export.h"
- }
+ export_class_attribute = "DEVICE_VR_EXPORT"
+ export_define = "DEVICE_VR_IMPLEMENTATION=1"
+ export_header = "device/vr/vr_export.h"
}
« no previous file with comments | « device/BUILD.gn ('k') | device/vr/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698