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

Unified Diff: chrome/chrome_resources.gyp

Issue 2004143002: Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5 (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 side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index f3fc15ab061d430fa5bfa6ae3f788ee5f0f9e79c..ff94d953db3dbe146dc7cad4f2194051393ba476 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -542,12 +542,6 @@
{
'includes': ['chrome_repack_chrome_200_percent.gypi']
},
- {
- 'includes': ['chrome_repack_chrome_material_100_percent.gypi']
- },
- {
- 'includes': ['chrome_repack_chrome_material_200_percent.gypi']
- },
],
'conditions': [ # GN version: chrome_repack_locales.gni template("_repack_one_locale")
['OS != "ios"', {
@@ -601,6 +595,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:
@@ -655,26 +659,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
« no previous file with comments | « chrome/chrome_repack_chrome_material_200_percent.gypi ('k') | chrome/installer/linux/common/installer.include » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698