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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 1889073002: Revert of Android: Avoid linking with --gc-sections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « chrome/browser/ui/BUILD.gn ('k') | 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 fd7e3e02ed365195cb4cf8d5fb5db32d20154260..6cf22d878c255cbeca1871ae2278ee1652b59925 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1923,8 +1923,6 @@
'browser/ui/exclusive_access/fullscreen_controller_state_tests.h',
'browser/ui/exclusive_access/fullscreen_controller_test.cc',
'browser/ui/exclusive_access/fullscreen_controller_test.h',
- 'browser/ui/passwords/manage_passwords_ui_controller_mock.cc',
- 'browser/ui/passwords/manage_passwords_ui_controller_mock.h',
'browser/ui/test/test_confirm_bubble_model.cc',
'browser/ui/test/test_confirm_bubble_model.h',
'renderer/safe_browsing/mock_feature_extractor_clock.cc',
@@ -2260,6 +2258,7 @@
'../components/components.gyp:webdata_services_test_support',
'../components/components_strings.gyp:components_strings',
'../content/app/resources/content_resources.gyp:content_resources',
+ '../device/core/core.gyp:device_core_mocks',
'../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'../device/usb/usb.gyp:device_usb_mocks',
'../gpu/gpu.gyp:gpu_unittest_utils',
@@ -2301,6 +2300,11 @@
],
'dependencies!': [
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
+ ],
+ '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',
@@ -2362,9 +2366,8 @@
'sources': [ '<@(chrome_unit_tests_extensions_sources)' ],
'dependencies': [
'common/extensions/api/api.gyp:chrome_api',
+ '../device/hid/hid.gyp:device_hid_mocks',
'../components/components.gyp:audio_modem_test_support',
- '../device/core/core.gyp:device_core_mocks',
- '../device/hid/hid.gyp:device_hid_mocks',
'../extensions/extensions_resources.gyp:extensions_resources',
'../extensions/extensions_strings.gyp:extensions_strings',
],
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698