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

Side by Side Diff: chrome/unit_tests.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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" or OS=="linux"', { 6 ['OS=="android" or OS=="linux"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_untracked': [ 8 'isolate_dependency_untracked': [
9 '<(PRODUCT_DIR)/test_data/', 9 '<(PRODUCT_DIR)/test_data/',
10 ], 10 ],
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 ['OS=="linux" or OS=="mac"', { 77 ['OS=="linux" or OS=="mac"', {
78 'variables': { 78 'variables': {
79 # Can't be enabled on Windows due to http://crbug.com/342913 79 # Can't be enabled on Windows due to http://crbug.com/342913
80 'read_only': 1, 80 'read_only': 1,
81 }, 81 },
82 }], 82 }],
83 ['OS=="mac"', { 83 ['OS=="mac"', {
84 'variables': { 84 'variables': {
85 'isolate_dependency_tracked': [ 85 'isolate_dependency_tracked': [
86 '<(PRODUCT_DIR)/ffmpegsumo.so', 86 '<(PRODUCT_DIR)/ffmpegsumo.so',
87 '<(PRODUCT_DIR)/libexif.dylib',
87 '<(PRODUCT_DIR)/osmesa.so', 88 '<(PRODUCT_DIR)/osmesa.so',
88 ], 89 ],
89 'isolate_dependency_untracked': [ 90 'isolate_dependency_untracked': [
90 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 91 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
91 ], 92 ],
92 }, 93 },
93 }], 94 }],
94 ['OS=="mac" or OS=="win"', { 95 ['OS=="mac" or OS=="win"', {
95 'variables': { 96 'variables': {
96 'command': [ 97 'command': [
97 '../testing/test_env.py', 98 '../testing/test_env.py',
98 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', 99 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
99 '--brave-new-test-launcher', 100 '--brave-new-test-launcher',
100 '--test-launcher-bot-mode', 101 '--test-launcher-bot-mode',
101 ], 102 ],
102 'isolate_dependency_untracked': [ 103 'isolate_dependency_untracked': [
103 '<(PRODUCT_DIR)/test_data/chrome/browser/resources/google_now/', 104 '<(PRODUCT_DIR)/test_data/chrome/browser/resources/google_now/',
104 '<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/', 105 '<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/',
105 '<(PRODUCT_DIR)/test_data/chrome/test/data/unit/', 106 '<(PRODUCT_DIR)/test_data/chrome/test/data/unit/',
106 '<(PRODUCT_DIR)/test_data/ui/', 107 '<(PRODUCT_DIR)/test_data/ui/',
107 ], 108 ],
108 }, 109 },
109 }], 110 }],
110 ['OS=="win"', { 111 ['OS=="win"', {
111 'variables': { 112 'variables': {
112 'isolate_dependency_tracked': [ 113 'isolate_dependency_tracked': [
113 '<(PRODUCT_DIR)/chrome_elf.dll', 114 '<(PRODUCT_DIR)/chrome_elf.dll',
114 '<(PRODUCT_DIR)/ffmpegsumo.dll', 115 '<(PRODUCT_DIR)/ffmpegsumo.dll',
116 '<(PRODUCT_DIR)/libexif.dll',
115 '<(PRODUCT_DIR)/osmesa.dll', 117 '<(PRODUCT_DIR)/osmesa.dll',
116 ], 118 ],
117 'isolate_dependency_untracked': [ 119 'isolate_dependency_untracked': [
118 '../ppapi/lib/gl/include/KHR/', 120 '../ppapi/lib/gl/include/KHR/',
119 '../skia/ext/data/', 121 '../skia/ext/data/',
120 '../ui/base/glib/', 122 '../ui/base/glib/',
121 ], 123 ],
122 }, 124 },
123 }], 125 }],
124 ], 126 ],
125 'includes': [ 127 'includes': [
126 '../third_party/icu/icu.isolate', 128 '../third_party/icu/icu.isolate',
127 ], 129 ],
128 } 130 }
OLDNEW
« no previous file with comments | « chrome/tools/build/win/FILES.cfg ('k') | chrome/utility/media_galleries/image_metadata_extractor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698