diff options
| author | gunsch <gunsch@chromium.org> | 2015-04-03 14:47:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-03 21:48:33 +0000 |
| commit | 7623ad7130f4beb954b00192f8009de208ca84c0 (patch) | |
| tree | 51703bf5ebf12e0df162d0652aa88d4be95d8f70 | |
| parent | e76fd1767f3bf81a2e2231ec196c22571d5c3734 (diff) | |
| download | chromium_src-7623ad7130f4beb954b00192f8009de208ca84c0.zip chromium_src-7623ad7130f4beb954b00192f8009de208ca84c0.tar.gz chromium_src-7623ad7130f4beb954b00192f8009de208ca84c0.tar.bz2 | |
content_browsertests.isolate: ppapi_tests requires enable_plugins=1.
R=cjhopman@chromium.org,maruel@chromium.org
BUG=472823
Review URL: https://codereview.chromium.org/1057153002
Cr-Commit-Position: refs/heads/master@{#323826}
| -rw-r--r-- | build/android/pylib/utils/isolator.py | 1 | ||||
| -rw-r--r-- | build/isolate.gypi | 1 | ||||
| -rw-r--r-- | content/content_browsertests.isolate | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py index dbbef5c..8025b0f 100644 --- a/build/android/pylib/utils/isolator.py +++ b/build/android/pylib/utils/isolator.py @@ -30,6 +30,7 @@ def DefaultConfigVariables(): 'asan': '0', 'chromeos': '0', 'component': 'static_library', + 'enable_plugins': '0', 'fastbuild': '0', 'icu_use_data_file_flag': '1', 'lsan': '0', diff --git a/build/isolate.gypi b/build/isolate.gypi index f66175a..c85585d 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -80,6 +80,7 @@ '--config-variable', 'chromeos=<(chromeos)', '--config-variable', 'component=<(component)', '--config-variable', 'disable_nacl=<(disable_nacl)', + '--config-variable', 'enable_plugins=<(enable_plugins)', '--config-variable', 'fastbuild=<(fastbuild)', '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index aa24c23..2fcab67 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -68,6 +68,12 @@ '<(PRODUCT_DIR)/content_shell.pak', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', + ], + }, + }], + ['OS=="linux" and enable_plugins==1', { + 'variables': { + 'files': [ '<(PRODUCT_DIR)/libppapi_tests.so', ], }, |