| 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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//mojo/public/tools/bindings/mojom.gni") | 6 import("//mojo/public/tools/bindings/mojom.gni") |
| 7 | 7 |
| 8 if (is_android) { | 8 if (is_android) { |
| 9 import("//build/config/android/rules.gni") # For generate_jni(). | 9 import("//build/config/android/rules.gni") # For generate_jni(). |
| 10 } | 10 } |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 ":vr", | 55 ":vr", |
| 56 "//base", | 56 "//base", |
| 57 "//mojo/public/cpp/bindings", | 57 "//mojo/public/cpp/bindings", |
| 58 ] | 58 ] |
| 59 } | 59 } |
| 60 | 60 |
| 61 mojom("mojo_bindings") { | 61 mojom("mojo_bindings") { |
| 62 sources = [ | 62 sources = [ |
| 63 "vr_service.mojom", | 63 "vr_service.mojom", |
| 64 ] | 64 ] |
| 65 |
| 66 use_new_wrapper_types = false |
| 65 } | 67 } |
| 66 | 68 |
| 67 if (is_android) { | 69 if (is_android) { |
| 68 java_sources_needing_jni = | 70 java_sources_needing_jni = |
| 69 [ "android/java/src/org/chromium/device/vr/CardboardVRDevice.java" ] | 71 [ "android/java/src/org/chromium/device/vr/CardboardVRDevice.java" ] |
| 70 | 72 |
| 71 generate_jni("jni_headers") { | 73 generate_jni("jni_headers") { |
| 72 sources = java_sources_needing_jni | 74 sources = java_sources_needing_jni |
| 73 jni_package = "vr" | 75 jni_package = "vr" |
| 74 | 76 |
| 75 public_deps = [ | 77 public_deps = [ |
| 76 "//third_party/cardboard-java:cardboard-java", | 78 "//third_party/cardboard-java:cardboard-java", |
| 77 ] | 79 ] |
| 78 } | 80 } |
| 79 | 81 |
| 80 android_library("java") { | 82 android_library("java") { |
| 81 java_files = java_sources_needing_jni | 83 java_files = java_sources_needing_jni |
| 82 deps = [ | 84 deps = [ |
| 83 "//base:base_java", | 85 "//base:base_java", |
| 84 "//third_party/cardboard-java:cardboard-java", | 86 "//third_party/cardboard-java:cardboard-java", |
| 85 ] | 87 ] |
| 86 } | 88 } |
| 87 } | 89 } |
| OLD | NEW |