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

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

Issue 22557005: Revert 216822 "Remove chrome.pak references, build resources int..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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/chrome/chrome_android_paks.gypi ('k') | trunk/src/chrome/chrome_installer.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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 'app/theme/find_next_Template.pdf', 59 'app/theme/find_next_Template.pdf',
60 'app/theme/find_prev_Template.pdf', 60 'app/theme/find_prev_Template.pdf',
61 'app/theme/menu_overflow_down.pdf', 61 'app/theme/menu_overflow_down.pdf',
62 'app/theme/menu_overflow_up.pdf', 62 'app/theme/menu_overflow_up.pdf',
63 'browser/mac/install.sh', 63 'browser/mac/install.sh',
64 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
64 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', 65 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
65 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', 66 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
66 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_ INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', 67 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_ INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
67 # Note: pseudo_locales are generated via the packed_resources 68 # Note: pseudo_locales are generated via the packed_resources
68 # dependency but not copied to the final target. See 69 # dependency but not copied to the final target. See
69 # common.gypi for more info. 70 # common.gypi for more info.
70 ], 71 ],
71 'mac_bundle_resources!': [ 72 'mac_bundle_resources!': [
72 'app/framework-Info.plist', 73 'app/framework-Info.plist',
73 ], 74 ],
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 ['enable_webrtc==1 and libpeer_target_type!="static_library"', { 304 ['enable_webrtc==1 and libpeer_target_type!="static_library"', {
304 'copies': [{ 305 'copies': [{
305 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 306 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
306 'files': [ 307 'files': [
307 '<(PRODUCT_DIR)/libpeerconnection.so', 308 '<(PRODUCT_DIR)/libpeerconnection.so',
308 ], 309 ],
309 }], 310 }],
310 }], 311 }],
311 ], # conditions 312 ], # conditions
312 } 313 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_android_paks.gypi ('k') | trunk/src/chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698