| Index: components/components_tests.gyp
|
| diff --git a/components/components_tests.gyp b/components/components_tests.gyp
|
| index 51783292f8a61de97bd466fc55137914c7b1c46c..79f6ee7989311e35917ccdb93b56770a3b58c49f 100644
|
| --- a/components/components_tests.gyp
|
| +++ b/components/components_tests.gyp
|
| @@ -243,6 +243,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',
|
| ],
|
| @@ -858,6 +861,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)',
|
| @@ -880,6 +884,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',
|
| @@ -1447,16 +1452,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' ],
|
| },
|
|
|