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

Side by Side Diff: content/content_browsertests.isolate

Issue 216443005: Reapply "Media Galleries API Metadata: Image metadata" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge origin/master Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="android"', { 6 ['OS=="android"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', 9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
10 ], 10 ],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 '../tools/swarming_client/', 54 '../tools/swarming_client/',
55 ], 55 ],
56 }, 56 },
57 }], 57 }],
58 ['OS=="mac"', { 58 ['OS=="mac"', {
59 'variables': { 59 'variables': {
60 'isolate_dependency_tracked': [ 60 'isolate_dependency_tracked': [
61 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', 61 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
62 '<(PRODUCT_DIR)/content_resources.pak', 62 '<(PRODUCT_DIR)/content_resources.pak',
63 '<(PRODUCT_DIR)/ffmpegsumo.so', 63 '<(PRODUCT_DIR)/ffmpegsumo.so',
64 '<(PRODUCT_DIR)/libexif.dylib',
64 '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin', 65 '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin',
65 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin', 66 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin',
66 ], 67 ],
67 'isolate_dependency_untracked': [ 68 'isolate_dependency_untracked': [
68 '<(PRODUCT_DIR)/Content Shell.app/', 69 '<(PRODUCT_DIR)/Content Shell.app/',
69 ], 70 ],
70 }, 71 },
71 }], 72 }],
72 ['OS=="mac" or OS=="win"', { 73 ['OS=="mac" or OS=="win"', {
73 'variables': { 74 'variables': {
74 'command': [ 75 'command': [
75 '../testing/test_env.py', 76 '../testing/test_env.py',
76 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 77 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
77 '--test-launcher-bot-mode', 78 '--test-launcher-bot-mode',
78 ], 79 ],
79 }, 80 },
80 }], 81 }],
81 ['OS=="win"', { 82 ['OS=="win"', {
82 'variables': { 83 'variables': {
83 'isolate_dependency_tracked': [ 84 'isolate_dependency_tracked': [
84 '<(PRODUCT_DIR)/ffmpegsumo.dll', 85 '<(PRODUCT_DIR)/ffmpegsumo.dll',
86 '<(PRODUCT_DIR)/libexif.dll',
85 '<(PRODUCT_DIR)/chrome_100_percent.pak', 87 '<(PRODUCT_DIR)/chrome_100_percent.pak',
86 '<(PRODUCT_DIR)/clearkeycdm.dll', 88 '<(PRODUCT_DIR)/clearkeycdm.dll',
87 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 89 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
88 '<(PRODUCT_DIR)/content_shell.pak', 90 '<(PRODUCT_DIR)/content_shell.pak',
89 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll', 91 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
90 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 92 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
91 ], 93 ],
92 }, 94 },
93 }], 95 }],
94 ], 96 ],
95 } 97 }
OLDNEW
« no previous file with comments | « chrome/utility/media_galleries/media_metadata_parser.cc ('k') | third_party/libexif/libexif.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698