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

Side by Side Diff: base/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
« no previous file with comments | « ash/wm/overview/window_grid.cc ('k') | base/android/junit/src/org/chromium/base/LogTest.java » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/rules.gni") 9 import("//build/config/android/rules.gni")
10 } 10 }
(...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1456 } 1456 }
1457 1457
1458 # GYP: //base.gyp:base_java_test_support 1458 # GYP: //base.gyp:base_java_test_support
1459 android_library("base_java_test_support") { 1459 android_library("base_java_test_support") {
1460 deps = [ 1460 deps = [
1461 ":base_java", 1461 ":base_java",
1462 ] 1462 ]
1463 DEPRECATED_java_in_dir = "test/android/javatests/src" 1463 DEPRECATED_java_in_dir = "test/android/javatests/src"
1464 } 1464 }
1465 1465
1466 # GYP: //base.gyp:base_junit_tests
1467 junit_binary("base_junit_tests") {
1468 java_files = [ "android/junit/src/org/chromium/base/LogTest.java" ]
1469 deps = [
1470 ":base_java",
1471 ":base_java_test_support",
1472 ]
1473 }
1474
1466 # GYP: //base.gyp:base_java_application_state 1475 # GYP: //base.gyp:base_java_application_state
1467 # GYP: //base.gyp:base_java_library_load_from_apk_status_codes 1476 # GYP: //base.gyp:base_java_library_load_from_apk_status_codes
1468 # GYP: //base.gyp:base_java_library_process_type 1477 # GYP: //base.gyp:base_java_library_process_type
1469 # GYP: //base.gyp:base_java_memory_pressure_level 1478 # GYP: //base.gyp:base_java_memory_pressure_level
1470 java_cpp_enum("base_android_java_enums_srcjar") { 1479 java_cpp_enum("base_android_java_enums_srcjar") {
1471 sources = [ 1480 sources = [
1472 "android/application_status_listener.h", 1481 "android/application_status_listener.h",
1473 "android/library_loader/library_load_from_apk_status_codes.h", 1482 "android/library_loader/library_load_from_apk_status_codes.h",
1474 "android/library_loader/library_loader_hooks.h", 1483 "android/library_loader/library_loader_hooks.h",
1475 "memory/memory_pressure_listener.h", 1484 "memory/memory_pressure_listener.h",
(...skipping 16 matching lines...) Expand all
1492 1501
1493 # GYP: //base.gyp:base_java_unittest_support 1502 # GYP: //base.gyp:base_java_unittest_support
1494 android_library("base_java_unittest_support") { 1503 android_library("base_java_unittest_support") {
1495 deps = [ 1504 deps = [
1496 ":base_java", 1505 ":base_java",
1497 ] 1506 ]
1498 java_files = 1507 java_files =
1499 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1508 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1500 } 1509 }
1501 } 1510 }
OLDNEW
« no previous file with comments | « ash/wm/overview/window_grid.cc ('k') | base/android/junit/src/org/chromium/base/LogTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698