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

Unified Diff: components/components_tests.gyp

Issue 1028543002: Turn the utility process image decoder into a Mojo service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address comments. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/components.gyp ('k') | components/components_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 00d8805384574fe98cc49f433153db07143ee840..3a395f256c8ba83351dfdc910416a04a9ea3199f 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -247,6 +247,9 @@
'history/core/browser/visit_tracker_unittest.cc',
'history/core/common/thumbnail_score_unittest.cc',
],
+ 'image_decoder_unittest_sources': [
+ 'image_decoder/image_decoder_impl_unittest.cc',
+ ],
'instance_id_unittest_sources': [
'gcm_driver/instance_id/instance_id_driver_unittest.cc',
],
@@ -860,6 +863,7 @@
'<@(devtools_http_handler_unittest_sources)',
'<@(error_page_unittest_sources)',
'<@(guest_view_unittest_sources)',
+ '<@(image_decoder_unittest_sources)',
'<@(navigation_interception_unittest_sources)',
'<@(network_hints_unittest_sources)',
'<@(power_unittest_sources)',
@@ -882,6 +886,7 @@
'components.gyp:error_page_renderer',
'components.gyp:favicon_content',
'components.gyp:history_content_browser',
+ 'components.gyp:image_decoder',
'components.gyp:keyed_service_content',
'components.gyp:navigation_interception',
'components.gyp:network_hints_renderer',
@@ -1437,16 +1442,43 @@
],
}],
['OS == "android"', {
+ 'variables': {
+ 'conditions': [
+ ['v8_use_external_startup_data==1', {
+ 'components_unittests_pak_input_resources': [
+ '<(PRODUCT_DIR)/natives_blob.bin',
+ '<(PRODUCT_DIR)/snapshot_blob.bin',
+ ],
+ }],
+ ],
+ },
'targets': [
{
+ 'target_name': 'components_unittests_paks_copy',
+ 'type': 'none',
+ 'dependencies': [
+ 'components_unittests',
+ ],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)/components_unittests_apk/assets',
+ 'files': [
+ '<@(components_unittests_pak_input_resources)',
+ ],
+ }
+ ],
+ },
+ {
'target_name': 'components_unittests_apk',
'type': 'none',
'dependencies': [
'components_unittests',
+ 'components_unittests_paks_copy',
'components.gyp:invalidation_java',
],
'variables': {
'test_suite_name': 'components_unittests',
+ 'asset_location': '<(PRODUCT_DIR)/components_unittests_apk/assets',
},
'includes': [ '../build/apk_test.gypi' ],
},
« no previous file with comments | « components/components.gyp ('k') | components/components_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698