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

Side by Side Diff: trunk/src/chrome/chrome_dll_bundle.gypi

Issue 214833004: Revert 259788 "Fixup mojo dylibs" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/chrome/tools/build/mac/dump_product_syms » ('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) 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 # but this seems like a really good place to store them. 121 # but this seems like a really good place to store them.
122 'postbuild_name': 'Tweak Info.plist', 122 'postbuild_name': 'Tweak Info.plist',
123 'action': ['<(tweak_info_plist_path)', 123 'action': ['<(tweak_info_plist_path)',
124 '--breakpad=<(mac_breakpad_compiled_in)', 124 '--breakpad=<(mac_breakpad_compiled_in)',
125 '--breakpad_uploads=<(mac_breakpad_uploads)', 125 '--breakpad_uploads=<(mac_breakpad_uploads)',
126 '--keystone=0', 126 '--keystone=0',
127 '--scm=1', 127 '--scm=1',
128 '--branding=<(branding)'], 128 '--branding=<(branding)'],
129 }, 129 },
130 { 130 {
131 # Copy libmojo_system.dylib explicitly. The copies section does a
132 # hard link, and since we modify it we would end up with the wrong
133 # load command in things linked afterward.
134 'postbuild_name': 'Copy libmojo_system.dylib',
135 'action': ['cp',
136 '-p',
137 '${BUILT_PRODUCTS_DIR}/libmojo_system.dylib',
138 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries'],
139 },
140 {
141 # Changes the id of libmojo_system.dylib to come from the Libraries folder
142 # to be consistent with the load command.
143 'postbuild_name': 'Update id of libmojo_system.dylib',
144 'action': ['install_name_tool',
145 '-id',
146 '@loader_path/Libraries/libmojo_system.dylib',
147 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libmoj o_system.dylib'],
148 },
149 {
150 # Changes the load command of libmojo_system.dylib to come from
151 # the Libraries folder.
152 'postbuild_name': 'Update load of libmojo_system.dylib',
153 'action': ['install_name_tool',
154 '-change',
155 '@loader_path/libmojo_system.dylib',
156 '@loader_path/Libraries/libmojo_system.dylib',
157 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'],
158 },
159 {
160 'postbuild_name': 'Symlink Libraries', 131 'postbuild_name': 'Symlink Libraries',
161 'action': [ 132 'action': [
162 'ln', 133 'ln',
163 '-fns', 134 '-fns',
164 'Versions/Current/Libraries', 135 'Versions/Current/Libraries',
165 '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries' 136 '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries'
166 ], 137 ],
167 }, 138 },
168 ], 139 ],
169 'copies': [ 140 'copies': [
170 { 141 {
171 # Copy FFmpeg binaries for audio/video support and mojo. 142 # Copy FFmpeg binaries for audio/video support.
172 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 143 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
173 'files': [ 144 'files': [
174 '<(PRODUCT_DIR)/ffmpegsumo.so', 145 '<(PRODUCT_DIR)/ffmpegsumo.so',
175 ], 146 ],
176 }, 147 },
177 { 148 {
178 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', 149 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
179 'files': [], 150 'files': [],
180 'conditions': [ 151 'conditions': [
181 ['internal_pdf', { 152 ['internal_pdf', {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 ], 308 ],
338 }], 309 }],
339 }], 310 }],
340 ['icu_use_data_file_flag==1', { 311 ['icu_use_data_file_flag==1', {
341 'mac_bundle_resources': [ 312 'mac_bundle_resources': [
342 '<(PRODUCT_DIR)/icudtl.dat', 313 '<(PRODUCT_DIR)/icudtl.dat',
343 ], 314 ],
344 }], 315 }],
345 ], # conditions 316 ], # conditions
346 } 317 }
OLDNEW
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/chrome/tools/build/mac/dump_product_syms » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698