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

Side by Side Diff: chrome/android/BUILD.gn

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 7 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/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/icu/config.gni") 10 import("//third_party/icu/config.gni")
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 229 }
230 230
231 # GYP: N/A 231 # GYP: N/A
232 android_library("chrome_shell_java") { 232 android_library("chrome_shell_java") {
233 testonly = true 233 testonly = true
234 deps = [ 234 deps = [
235 ":chrome_shell_resources", 235 ":chrome_shell_resources",
236 ":chrome_java", 236 ":chrome_java",
237 "//base:base_java", 237 "//base:base_java",
238 "//content/public/android:content_java", 238 "//content/public/android:content_java",
239 "//components/dom_distiller/android:dom_distiller_content_java",
239 "//components/dom_distiller/android:dom_distiller_core_java", 240 "//components/dom_distiller/android:dom_distiller_core_java",
240 "//components/service_tab_launcher:service_tab_launcher_java", 241 "//components/service_tab_launcher:service_tab_launcher_java",
241 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va", 242 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va",
242 "//printing:printing_java", 243 "//printing:printing_java",
243 "//net/android:net_java", 244 "//net/android:net_java",
244 "//sync/android:sync_java", 245 "//sync/android:sync_java",
245 "//third_party/android_tools:android_support_v13_java", 246 "//third_party/android_tools:android_support_v13_java",
246 "//third_party/android_tools:android_support_v7_appcompat_java", 247 "//third_party/android_tools:android_support_v7_appcompat_java",
247 "//ui/android:ui_java", 248 "//ui/android:ui_java",
248 ] 249 ]
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 ":chrome_shell_test_java", 458 ":chrome_shell_test_java",
458 "//sync/android:sync_javatests", 459 "//sync/android:sync_javatests",
459 "//ui/android:ui_javatests", 460 "//ui/android:ui_javatests",
460 ] 461 ]
461 apk_name = "ChromeShellTest" 462 apk_name = "ChromeShellTest"
462 android_manifest = "shell/javatests/AndroidManifest.xml" 463 android_manifest = "shell/javatests/AndroidManifest.xml"
463 } 464 }
464 465
465 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests 466 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
466 junit_binary("chrome_junit_tests") { 467 junit_binary("chrome_junit_tests") {
467 java_files = 468 java_files = [
468 [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ] 469 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java",
470 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav a",
471 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java ",
472 "junit/src/org/chromium/chrome/browser/media/remote/TransportControlTest.jav a",
473 ]
469 deps = [ 474 deps = [
470 ":chrome_java", 475 ":chrome_java",
471 "//base:base_java", 476 "//base:base_java",
472 "//base:base_java_test_support", 477 "//base:base_java_test_support",
478 "//third_party/junit:hamcrest",
473 ] 479 ]
474 } 480 }
475 481
476 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk 482 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk
477 if (false) { 483 if (false) {
478 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p orted. 484 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p orted.
479 # crbug.com/475612 485 # crbug.com/475612
480 android_apk("chrome_sync_shell_test_apk") { 486 android_apk("chrome_sync_shell_test_apk") {
481 apk_under_test = ":chrome_sync_shell_apk" 487 apk_under_test = ":chrome_sync_shell_apk"
482 testonly = true 488 testonly = true
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 ] 538 ]
533 } 539 }
534 540
535 zip("chrome_version_srcjar") { 541 zip("chrome_version_srcjar") {
536 inputs = [ 542 inputs = [
537 chrome_version_java_file, 543 chrome_version_java_file,
538 ] 544 ]
539 output = "$target_gen_dir/$target_name.srcjar" 545 output = "$target_gen_dir/$target_name.srcjar"
540 base_dir = chrome_version_java_dir 546 base_dir = chrome_version_java_dir
541 } 547 }
OLDNEW
« no previous file with comments | « cc/trees/single_thread_proxy.cc ('k') | chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698