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

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: add comment as suggested by Daniel Created 4 years, 3 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
« no previous file with comments | « no previous file | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 "//components/navigation_interception/android:navigation_interception_java ", 241 "//components/navigation_interception/android:navigation_interception_java ",
242 "//components/ntp_tiles/android:ntp_tiles_java", 242 "//components/ntp_tiles/android:ntp_tiles_java",
243 "//components/policy/android:policy_java", 243 "//components/policy/android:policy_java",
244 "//components/precache/android:precache_java", 244 "//components/precache/android:precache_java",
245 "//components/safe_json/android:safe_json_java", 245 "//components/safe_json/android:safe_json_java",
246 "//components/signin/core/browser/android:java", 246 "//components/signin/core/browser/android:java",
247 "//components/sync/android:sync_java", 247 "//components/sync/android:sync_java",
248 "//components/web_contents_delegate_android:web_contents_delegate_android_ java", 248 "//components/web_contents_delegate_android:web_contents_delegate_android_ java",
249 ] 249 ]
250 } 250 }
251
252 # VrActivity currently depends on ChromeTabbedActivity which is part of
253 # android_java_ui.
254 if (enable_vr_shell && android_java_ui) {
255 java_files += chrome_vr_java_sources
256 deps += [
257 "//third_party/gvr-android-sdk:gvr_base_java",
258 "//third_party/gvr-android-sdk:gvr_common_java",
259 ]
260 }
251 } 261 }
252 262
253 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java 263 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
254 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java 264 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java
255 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java 265 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java
256 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java 266 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
257 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java 267 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java
258 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java 268 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java
259 269
260 action("chrome_android_java_google_api_keys_srcjar") { 270 action("chrome_android_java_google_api_keys_srcjar") {
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 instrumentation_test_apk("chrome_sync_shell_test_apk") { 650 instrumentation_test_apk("chrome_sync_shell_test_apk") {
641 apk_name = "ChromeSyncShellTest" 651 apk_name = "ChromeSyncShellTest"
642 apk_under_test = ":chrome_sync_shell_apk" 652 apk_under_test = ":chrome_sync_shell_apk"
643 android_manifest = chrome_sync_shell_test_apk_manifest 653 android_manifest = chrome_sync_shell_test_apk_manifest
644 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 654 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
645 deps = [ 655 deps = [
646 ":chrome_sync_shell_test_apk_java", 656 ":chrome_sync_shell_test_apk_java",
647 ] 657 ]
648 proguard_enabled = !is_java_debug 658 proguard_enabled = !is_java_debug
649 } 659 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698