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

Side by Side Diff: chrome/chrome_dll_bundle.gypi

Issue 877553010: Fix Mac gyp error with disable_nacl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | no next file » | 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) 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 # This file contains resources for the main Mac chromium bundle. 5 # This file contains resources for the main Mac chromium bundle.
6 { 6 {
7 # The main browser executable's name is <(mac_product_name). 7 # The main browser executable's name is <(mac_product_name).
8 # Certain things will get confused if two modules in the 8 # Certain things will get confused if two modules in the
9 # executable share the same name, so append " Framework" to the 9 # executable share the same name, so append " Framework" to the
10 # product_name used for the framework. This will result in 10 # product_name used for the framework. This will result in
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 'copies': [ 139 'copies': [
140 { 140 {
141 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 141 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
142 'files': [ 142 'files': [
143 '<(PRODUCT_DIR)/exif.so', 143 '<(PRODUCT_DIR)/exif.so',
144 '<(PRODUCT_DIR)/ffmpegsumo.so', 144 '<(PRODUCT_DIR)/ffmpegsumo.so',
145 ], 145 ],
146 }, 146 },
147 { 147 {
148 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', 148 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
149 'files': [],
149 'conditions': [ 150 'conditions': [
150 ['disable_nacl!=1', { 151 ['disable_nacl!=1', {
151 'conditions': [ 152 'conditions': [
152 ['target_arch=="x64"', { 153 ['target_arch=="x64"', {
153 'files': [ 154 'files': [
154 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 155 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
155 ], 156 ],
156 }, { 157 }, {
157 'files': [ 158 'files': [
158 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 159 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 ], 300 ],
300 }], 301 }],
301 ['v8_use_external_startup_data==1', { 302 ['v8_use_external_startup_data==1', {
302 'mac_bundle_resources': [ 303 'mac_bundle_resources': [
303 '<(PRODUCT_DIR)/natives_blob.bin', 304 '<(PRODUCT_DIR)/natives_blob.bin',
304 '<(PRODUCT_DIR)/snapshot_blob.bin', 305 '<(PRODUCT_DIR)/snapshot_blob.bin',
305 ], 306 ],
306 }], 307 }],
307 ], # conditions 308 ], # conditions
308 } 309 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698