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

Side by Side Diff: chrome/chrome_dll_bundle.gypi

Issue 2001093002: Revert of Remove enable_topchrome_md build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « chrome/browser_tests.isolate ('k') | chrome/chrome_repack_chrome_material_100_percent.gypi » ('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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 # needs to exist as a file on disk and not just something in a 51 # needs to exist as a file on disk and not just something in a
52 # resource bundle because that's the interface that 52 # resource bundle because that's the interface that
53 # Authorization Services uses. Also, Authorization Services 53 # Authorization Services uses. Also, Authorization Services
54 # can't deal with .icns files. 54 # can't deal with .icns files.
55 'app/theme/default_100_percent/<(theme_dir_name)/product_logo_32.png', 55 'app/theme/default_100_percent/<(theme_dir_name)/product_logo_32.png',
56 56
57 'app/framework-Info.plist', 57 'app/framework-Info.plist',
58 '<@(mac_all_xibs)', 58 '<@(mac_all_xibs)',
59 'browser/mac/install.sh', 59 'browser/mac/install.sh',
60 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', 60 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
61 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_percent.pak',
62 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', 61 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
63 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_ INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', 62 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_ INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
64 # Note: pseudo_locales are generated via the packed_resources 63 # Note: pseudo_locales are generated via the packed_resources
65 # dependency but not copied to the final target. See 64 # dependency but not copied to the final target. See
66 # common.gypi for more info. 65 # common.gypi for more info.
67 ], 66 ],
68 'mac_bundle_resources!': [ 67 'mac_bundle_resources!': [
69 'app/framework-Info.plist', 68 'app/framework-Info.plist',
70 ], 69 ],
71 'dependencies': [ 70 'dependencies': [
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 'ln', 223 'ln',
225 '-fs', 224 '-fs',
226 '${BUILT_PRODUCTS_DIR}/resources/inspector', 225 '${BUILT_PRODUCTS_DIR}/resources/inspector',
227 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources', 226 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources',
228 ], 227 ],
229 }], 228 }],
230 }], 229 }],
231 ['enable_hidpi==1', { 230 ['enable_hidpi==1', {
232 'mac_bundle_resources': [ 231 'mac_bundle_resources': [
233 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', 232 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
233 ],
234 }],
235 ['enable_topchrome_md==1', {
236 'mac_bundle_resources': [
237 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_percent.pak',
238 ],
239 }],
240 ['enable_topchrome_md==1 and enable_hidpi==1', {
241 'mac_bundle_resources': [
234 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_percent.pak', 242 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_percent.pak',
235 ], 243 ],
236 }], 244 }],
237 ['icu_use_data_file_flag==1', { 245 ['icu_use_data_file_flag==1', {
238 'mac_bundle_resources': [ 246 'mac_bundle_resources': [
239 '<(PRODUCT_DIR)/icudtl.dat', 247 '<(PRODUCT_DIR)/icudtl.dat',
240 ], 248 ],
241 }], 249 }],
242 ['v8_use_external_startup_data==1', { 250 ['v8_use_external_startup_data==1', {
243 'mac_bundle_resources': [ 251 'mac_bundle_resources': [
244 '<(PRODUCT_DIR)/natives_blob.bin', 252 '<(PRODUCT_DIR)/natives_blob.bin',
245 '<(PRODUCT_DIR)/snapshot_blob.bin', 253 '<(PRODUCT_DIR)/snapshot_blob.bin',
246 ], 254 ],
247 }], 255 }],
248 ], # conditions 256 ], # conditions
249 } 257 }
OLDNEW
« no previous file with comments | « chrome/browser_tests.isolate ('k') | chrome/chrome_repack_chrome_material_100_percent.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698