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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 "//components/navigation_interception/android:navigation_interception_java ", 239 "//components/navigation_interception/android:navigation_interception_java ",
240 "//components/ntp_tiles/android:ntp_tiles_java", 240 "//components/ntp_tiles/android:ntp_tiles_java",
241 "//components/policy/android:policy_java", 241 "//components/policy/android:policy_java",
242 "//components/precache/android:precache_java", 242 "//components/precache/android:precache_java",
243 "//components/safe_json/android:safe_json_java", 243 "//components/safe_json/android:safe_json_java",
244 "//components/signin/core/browser/android:java", 244 "//components/signin/core/browser/android:java",
245 "//components/sync/android:sync_java", 245 "//components/sync/android:sync_java",
246 "//components/web_contents_delegate_android:web_contents_delegate_android_ java", 246 "//components/web_contents_delegate_android:web_contents_delegate_android_ java",
247 ] 247 ]
248 } 248 }
249
250 if (enable_vr_shell) {
251 java_files += chrome_vr_java_sources
252 deps += [
253 "//third_party/gvr-android-sdk:gvr_base_java",
254 "//third_party/gvr-android-sdk:gvr_common_java",
255 ]
256 }
249 } 257 }
250 258
251 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java 259 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
252 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java 260 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java
253 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java 261 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java
254 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java 262 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
255 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java 263 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java
256 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java 264 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java
257 265
258 action("chrome_android_java_google_api_keys_srcjar") { 266 action("chrome_android_java_google_api_keys_srcjar") {
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 chrome_public_apk_tmpl_shared("chrome_public_apk") { 553 chrome_public_apk_tmpl_shared("chrome_public_apk") {
546 android_manifest = get_target_outputs(":chrome_public_apk_manifest") 554 android_manifest = get_target_outputs(":chrome_public_apk_manifest")
547 android_manifest = android_manifest[1] 555 android_manifest = android_manifest[1]
548 android_manifest_dep = ":chrome_public_apk_manifest" 556 android_manifest_dep = ":chrome_public_apk_manifest"
549 apk_name = "ChromePublic" 557 apk_name = "ChromePublic"
550 shared_libraries = [ ":chrome" ] 558 shared_libraries = [ ":chrome" ]
551 559
552 deps = [ 560 deps = [
553 ":chrome_public_apk_template_resources", 561 ":chrome_public_apk_template_resources",
554 ] 562 ]
563
564 if (enable_vr_shell) {
565 deps += [ "//third_party/gvr-android-sdk:libgvr_shared_library" ]
566 loadable_modules = [ "$root_out_dir/libgvr.so" ]
567 }
555 } 568 }
556 569
557 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { 570 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
558 testonly = true 571 testonly = true
559 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest") 572 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest")
560 android_manifest = android_manifest[1] 573 android_manifest = android_manifest[1]
561 android_manifest_dep = ":chrome_sync_shell_apk_manifest" 574 android_manifest_dep = ":chrome_sync_shell_apk_manifest"
562 apk_name = "ChromeSyncShell" 575 apk_name = "ChromeSyncShell"
563 shared_libraries = [ ":chrome_sync_shell" ] 576 shared_libraries = [ ":chrome_sync_shell" ]
564 577
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 instrumentation_test_apk("chrome_sync_shell_test_apk") { 652 instrumentation_test_apk("chrome_sync_shell_test_apk") {
640 apk_name = "ChromeSyncShellTest" 653 apk_name = "ChromeSyncShellTest"
641 apk_under_test = ":chrome_sync_shell_apk" 654 apk_under_test = ":chrome_sync_shell_apk"
642 android_manifest = chrome_sync_shell_test_apk_manifest 655 android_manifest = chrome_sync_shell_test_apk_manifest
643 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 656 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
644 deps = [ 657 deps = [
645 ":chrome_sync_shell_test_apk_java", 658 ":chrome_sync_shell_test_apk_java",
646 ] 659 ]
647 proguard_enabled = !is_java_debug 660 proguard_enabled = !is_java_debug
648 } 661 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698