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

Unified Diff: base/base.gyp

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, 8 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
« no previous file with comments | « base/android/junit/src/org/chromium/base/LogTest.java ('k') | base/i18n/icu_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 325210f4af2f702adee32e37b90cd746e21f66a3..2543156129db2b8a19c1bed121fe29526b10d4e3 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -803,14 +803,6 @@
'../third_party/icu/icu.gyp:icudata',
],
}],
- ['incremental_chrome_dll', {
- 'defines': [
- # Used only to workaround a linker bug, do not use this
- # otherwise, and don't make it broader scope. See
- # http://crbug.com/251251.
- 'INCREMENTAL_LINKING',
- ],
- }],
],
}, { # OS != "win"
'dependencies': [
@@ -1509,6 +1501,23 @@
'includes': [ '../build/java.gypi' ],
},
{
+ # GN: //base:base_junit_tests
+ 'target_name': 'base_junit_tests',
+ 'type': 'none',
+ 'dependencies': [
+ 'base_java',
+ 'base_java_test_support',
+ '../testing/android/junit/junit_test.gyp:junit_test_support',
+ ],
+ 'variables': {
+ 'main_class': 'org.chromium.testing.local.JunitTestMain',
+ 'src_paths': [
+ '../base/android/junit/',
+ ],
+ },
+ 'includes': [ '../build/host_jar.gypi' ],
+ },
+ {
# GN: //base:base_javatests
'target_name': 'base_javatests',
'type': 'none',
« no previous file with comments | « base/android/junit/src/org/chromium/base/LogTest.java ('k') | base/i18n/icu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698