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

Unified Diff: chrome/chrome_resources.gyp

Issue 1929693003: Populate download_file_types proto and filter it for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@file_type_polices2
Patch Set: fix chromeos detection again 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 f3ecee9b59ffb6c9a023f54f30195bdb26cfae8d..cf0f83610fc1d9621bf807b5ee106a971fc6e72f 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -314,6 +314,13 @@
'script_file':'browser/resources/safe_browsing/gen_file_type_proto.py',
'asciipb_file' : 'browser/resources/safe_browsing/download_file_types.asciipb',
'output_file' : '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/safe_browsing/download_file_types.pb',
+ 'conditions': [
+ ['OS=="android"', { 'platform': 'android' },],
+ ['chromeos==1', { 'platform': 'chromeos' },],
+ ['OS=="linux" and chromeos!=1', { 'platform': 'linux' },],
Lei Zhang 2016/05/09 23:28:01 Can you try using the else-if feature in GYP? I t
Nathan Parker 2016/05/10 17:33:51 ooo, didn't know that was possible. Done.
+ ['OS=="mac"', { 'platform': 'mac' },],
+ ['OS=="win"', { 'platform': 'win' },],
+ ],
},
'inputs': [
'<(script_file)',
@@ -328,6 +335,7 @@
'-w',
'-i', '<(asciipb_file)',
'-o', '<(output_file)',
+ '-t', '<(platform)',
'-p', '<(PRODUCT_DIR)/pyproto',
'-p', '<(PRODUCT_DIR)/pyproto/chrome/common/safe_browsing',
],

Powered by Google App Engine
This is Rietveld 408576698