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

Side by Side Diff: chrome/chrome.isolate

Issue 600263002: Get Win32K lockdown for renderers working again on Windows 8+. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix linux build failures Created 6 years, 2 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
« no previous file with comments | « no previous file | content/app/content_main_runner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '<(PRODUCT_DIR)/libffmpegsumo.so', 9 '<(PRODUCT_DIR)/libffmpegsumo.so',
10 '<(PRODUCT_DIR)/libosmesa.so', 10 '<(PRODUCT_DIR)/libosmesa.so',
(...skipping 25 matching lines...) Expand all
36 ], 36 ],
37 }, 37 },
38 }], 38 }],
39 ['OS=="win" or (OS=="linux" and target_arch=="x64")', { 39 ['OS=="win" or (OS=="linux" and target_arch=="x64")', {
40 'variables': { 40 'variables': {
41 'isolate_dependency_tracked': [ 41 'isolate_dependency_tracked': [
42 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 42 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
43 ], 43 ],
44 }, 44 },
45 }], 45 }],
46 ['OS=="win"', {
47 'variables': {
48 'isolate_dependency_tracked': [
49 '<(PRODUCT_DIR)/chrome_200_percent.pak',
50 ],
51 },
52 }],
46 ['OS=="mac"', { 53 ['OS=="mac"', {
47 'variables': { 54 'variables': {
48 'command': [ 55 'command': [
49 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)', 56 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)',
50 ], 57 ],
51 'isolate_dependency_tracked': [ 58 'isolate_dependency_tracked': [
52 '<(PRODUCT_DIR)/exif.so', 59 '<(PRODUCT_DIR)/exif.so',
53 '<(PRODUCT_DIR)/ffmpegsumo.so', 60 '<(PRODUCT_DIR)/ffmpegsumo.so',
54 ], 61 ],
55 'isolate_dependency_untracked': [ 62 'isolate_dependency_untracked': [
56 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 63 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
57 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/', 64 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/',
58 '<(PRODUCT_DIR)/<(mac_product_name).app/', 65 '<(PRODUCT_DIR)/<(mac_product_name).app/',
59 ], 66 ],
60 }, 67 },
61 }], 68 }],
62 ['OS=="win"', { 69 ['OS=="win"', {
63 'variables': { 70 'variables': {
64 'isolate_dependency_tracked': [ 71 'isolate_dependency_tracked': [
65 '<(PRODUCT_DIR)/<(version_full).manifest', 72 '<(PRODUCT_DIR)/<(version_full).manifest',
scottmg 2014/09/26 02:42:54 duplicate block, just move the new file down here
66 '<(PRODUCT_DIR)/chrome.dll', 73 '<(PRODUCT_DIR)/chrome.dll',
67 '<(PRODUCT_DIR)/chrome_elf.dll', 74 '<(PRODUCT_DIR)/chrome_elf.dll',
68 '<(PRODUCT_DIR)/ffmpegsumo.dll', 75 '<(PRODUCT_DIR)/ffmpegsumo.dll',
69 '<(PRODUCT_DIR)/libexif.dll', 76 '<(PRODUCT_DIR)/libexif.dll',
70 '<(PRODUCT_DIR)/osmesa.dll', 77 '<(PRODUCT_DIR)/osmesa.dll',
71 ], 78 ],
72 }, 79 },
73 }], 80 }],
74 ['OS=="win" and target_arch=="ia32"', { 81 ['OS=="win" and target_arch=="ia32"', {
75 'variables': { 82 'variables': {
76 'isolate_dependency_tracked': [ 83 'isolate_dependency_tracked': [
77 '<(PRODUCT_DIR)/nacl64.exe', 84 '<(PRODUCT_DIR)/nacl64.exe',
78 ], 85 ],
79 }, 86 },
80 }], 87 }],
81 ['OS=="win" and component=="static_library"', { 88 ['OS=="win" and component=="static_library"', {
82 'variables': { 89 'variables': {
83 'isolate_dependency_tracked': [ 90 'isolate_dependency_tracked': [
84 '<(PRODUCT_DIR)/chrome_child.dll', 91 '<(PRODUCT_DIR)/chrome_child.dll',
85 ], 92 ],
86 }, 93 },
87 }], 94 }],
88 ], 95 ],
89 'includes': [ 96 'includes': [
90 'angle.isolate', 97 'angle.isolate',
91 ], 98 ],
92 } 99 }
OLDNEW
« no previous file with comments | « no previous file | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698