chrome/chrome_resources.gyp - Issue 1929693003: Populate download_file_types proto and filter it for each platform

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebase 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

« chrome/browser/resources/safe_browsing/README.md ('K') | « chrome/browser/resources/safe_browsing/gen_file_type_proto.py ('k') | chrome/common/safe_browsing/download_file_types.proto » ('j') | chrome/common/safe_browsing/file_type_policies_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_resources.gyp

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp

index 531ca6721b2c96e8342ec730e0c08f952bd5b883..f2c75eb400bad387e3a06da13b3d8003336bd679 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' },],

+ ['desktop_linux==1', { 'platform': 'linux' },],

+ ['chromeos==1', { 'platform': 'chromeos' },],

+ ['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',