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

Unified Diff: chrome/android/BUILD.gn

Issue 2252103002: Introduce ChromeVR to Chrome on Android (behind a build flag) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: release SurfaceTexture in shutdown Created 4 years, 4 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
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 59740ba018eba7645265b81a4d769db5b8458f66..c8ffee5f4caa480724c35737e7a02b9fd761b82e 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -248,6 +248,14 @@ android_library("chrome_java") {
"//components/web_contents_delegate_android:web_contents_delegate_android_java",
]
}
+
+ if (enable_vr_shell) {
+ java_files += chrome_vr_java_sources
+ deps += [
+ "//third_party/gvr-android-sdk:gvr_base_java",
+ "//third_party/gvr-android-sdk:gvr_common_java",
+ ]
+ }
}
# GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
@@ -552,6 +560,11 @@ chrome_public_apk_tmpl_shared("chrome_public_apk") {
shared_libraries = [ ":chrome" ]
deps = []
+
+ if (enable_vr_shell) {
bajones 2016/08/19 17:29:42 This block won't be necessary once https://coderev
bshe 2016/08/19 21:05:10 yeap. Will rebase once your cl landed and thanks f
+ deps += [ "//third_party/gvr-android-sdk:libgvr_shared_library" ]
+ loadable_modules = [ "$root_out_dir/libgvr.so" ]
+ }
}
chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
« no previous file with comments | « no previous file | chrome/android/java/AndroidManifest.xml » ('j') | chrome/browser/android/vr_shell/vr_shell_renderer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698