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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 1415223005: Reorder chrome/test/BUILD.gn to match order in chrome_tests_unit.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « no previous file | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 4e5da4571581d716c8e1c2764aa10653422af3bc..d4df79c97f50c5ca4de5c8a6147de496dad96c41 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2273,6 +2273,31 @@
'includes': ['chrome_ios_bundle_resources.gypi'],
'xcode_settings': {'OTHER_LDFLAGS': ['-ObjC']},
}],
+ ['OS=="android"', {
+ 'sources': [ '<@(chrome_unit_tests_offline_pages_sources)' ],
+ 'dependencies!': [
+ '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
+ ],
+ 'sources!': [
+ 'common/spellcheck_common_unittest.cc',
+ 'renderer/spellchecker/spellcheck_multilingual_unittest.cc',
+ 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
+ 'renderer/spellchecker/spellcheck_unittest.cc',
+ ],
+ 'ldflags': [
+ # Some android targets still depend on --gc-sections to link.
+ # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
+ '-Wl,--gc-sections',
+ ],
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }, { # Not Android.
+ 'sources': [ '<@(chrome_unit_tests_non_android_sources)' ],
+ 'sources!': [
+ 'browser/download/download_request_infobar_delegate_unittest.cc',
+ ],
+ }],
['OS!="android" and OS!="ios"', {
'sources': [ '<@(chrome_unit_tests_non_mobile_sources)' ],
}],
@@ -2655,31 +2680,6 @@
['OS != "android" and chromeos == 0', {
'sources': [ '<@(chrome_unit_tests_non_android_or_chromeos_sources)' ],
}],
- ['OS=="android"', {
- 'sources': [ '<@(chrome_unit_tests_offline_pages_sources)' ],
- 'dependencies!': [
- '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
- ],
- 'sources!': [
- 'common/spellcheck_common_unittest.cc',
- 'renderer/spellchecker/spellcheck_multilingual_unittest.cc',
- 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
- 'renderer/spellchecker/spellcheck_unittest.cc',
- ],
- 'ldflags': [
- # Some android targets still depend on --gc-sections to link.
- # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
- '-Wl,--gc-sections',
- ],
- 'dependencies': [
- '../testing/android/native_test.gyp:native_test_native_code',
- ],
- }, { # Not Android.
- 'sources': [ '<@(chrome_unit_tests_non_android_sources)' ],
- 'sources!': [
- 'browser/download/download_request_infobar_delegate_unittest.cc',
- ],
- }],
['enable_themes == 1', {
'sources': [ '<@(chrome_unit_tests_themes_sources)' ],
}],
« no previous file with comments | « no previous file | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698