tools/json_schema_compiler/cpp_bundle_generator.py - Issue 1558413002: 'linux' platform should exclude 'chromeos' in json compiler.

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: tools/json_schema_compiler/cpp_bundle_generator.py

Issue 1558413002: 'linux' platform should exclude 'chromeos' in json compiler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add tests. Created 4 years, 11 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: tools/json_schema_compiler/cpp_bundle_generator.py

diff --git a/tools/json_schema_compiler/cpp_bundle_generator.py b/tools/json_schema_compiler/cpp_bundle_generator.py

index e240813f477b35237b7bbbf45e9f2e87a45bf520..168da10511c515b01250e9d67c701d6139488730 100644

--- a/tools/json_schema_compiler/cpp_bundle_generator.py

+++ b/tools/json_schema_compiler/cpp_bundle_generator.py

@@ -94,7 +94,7 @@ class CppBundleGenerator(object):

if platform == Platforms.CHROMEOS:

ifdefs.append('defined(OS_CHROMEOS)')

elif platform == Platforms.LINUX:

- ifdefs.append('defined(OS_LINUX)')

+ ifdefs.append('(defined(OS_LINUX) && !defined(OS_CHROMEOS))')

elif platform == Platforms.MAC:

ifdefs.append('defined(OS_MACOSX)')

elif platform == Platforms.WIN:

« no previous file with comments | « no previous file | tools/json_schema_compiler/cpp_bundle_generator_test.py » ('j') | tools/json_schema_compiler/cpp_bundle_generator_test.py » ('J')