diff options
| author | jaekyun <jaekyun@chromium.org> | 2015-06-25 15:52:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-25 22:53:11 +0000 |
| commit | 4b649a907d2458455d7f333d628b1b4720769afd (patch) | |
| tree | 304c2d37ccd740363711adc296074be54ce6b090 /components/components_tests.gyp | |
| parent | cdd4764372d3a951a9e83e9021fcf42fd01b21df (diff) | |
| download | chromium_src-4b649a907d2458455d7f333d628b1b4720769afd.zip chromium_src-4b649a907d2458455d7f333d628b1b4720769afd.tar.gz chromium_src-4b649a907d2458455d7f333d628b1b4720769afd.tar.bz2 | |
Rebuild components browsertests apk when its assets are updated
And enables CredentialManagerClientTest on Android because it was disabled
due to the same problem.
BUG=481415
Review URL: https://codereview.chromium.org/1203163004
Cr-Commit-Position: refs/heads/master@{#336287}
Diffstat (limited to 'components/components_tests.gyp')
| -rw-r--r-- | components/components_tests.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 31256da..a0c3ae9 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -1254,6 +1254,19 @@ 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/components_browsertests_manifest/AndroidManifest.xml', 'resource_dir': 'test/android/browsertests_apk/res', 'asset_location': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets', + 'conditions': [ + ['icu_use_data_file_flag==1', { + 'additional_input_paths': [ + '<(PRODUCT_DIR)/icudtl.dat', + ], + }], + ['v8_use_external_startup_data==1', { + 'additional_input_paths': [ + '<(PRODUCT_DIR)/natives_blob.bin', + '<(PRODUCT_DIR)/snapshot_blob.bin', + ], + }], + ], }, 'includes': [ '../build/apk_browsertest.gypi' ], }, |