Index: chrome/chrome_resources.gyp |
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp |
index 00c961cd581a8860c352634e73d10aa34b1a3629..72a4d55bbd4bc71dce0a39c10c256df1414b2bf8 100644 |
--- a/chrome/chrome_resources.gyp |
+++ b/chrome/chrome_resources.gyp |
@@ -542,12 +542,8 @@ |
{ |
'includes': ['chrome_repack_chrome_200_percent.gypi'] |
}, |
- { |
- 'includes': ['chrome_repack_chrome_material_100_percent.gypi'] |
- }, |
- { |
- 'includes': ['chrome_repack_chrome_material_200_percent.gypi'] |
- }, |
+ ], |
+ 'conditions': [ |
Lei Zhang
2016/05/19 21:51:53
Delete?
Evan Stade
2016/05/19 22:02:30
Done.
|
], |
'conditions': [ # GN version: chrome_repack_locales.gni template("_repack_one_locale") |
['OS != "ios"', { |
@@ -600,6 +596,16 @@ |
'<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_resources', |
], |
}], |
+ ['OS == "mac"', { |
+ 'actions': [ |
+ { |
+ 'includes': ['chrome_repack_chrome_material_100_percent.gypi'] |
+ }, |
+ { |
+ 'includes': ['chrome_repack_chrome_material_200_percent.gypi'] |
+ }, |
+ ], |
+ }], |
['OS != "mac" and OS != "ios"', { |
# Copy pak files to the product directory. These files will be picked |
# up by the following installer scripts: |
@@ -654,26 +660,6 @@ |
}, |
], |
}], |
- ['enable_topchrome_md == 1', { |
- 'copies': [ |
- { |
- 'destination': '<(PRODUCT_DIR)', |
- 'files': [ |
- '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_percent.pak', |
- ], |
- }, |
- ], |
- }], |
- ['enable_hidpi == 1 and enable_topchrome_md == 1', { |
- 'copies': [ |
- { |
- 'destination': '<(PRODUCT_DIR)', |
- 'files': [ |
- '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_percent.pak', |
- ], |
- }, |
- ], |
- }], |
], # conditions |
}], # end OS != "mac" and OS != "ios" |
], # conditions |