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

Unified Diff: tools/json_schema_compiler/cpp_bundle_generator.py

Issue 22295002: Base infrastructure for Networking Private API on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use crypto_verify_mock for browser_test. Created 7 years, 2 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
« no previous file with comments | « ipc/ipc_message_start.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c713d555f72ab0205f268b139561bd6d36c3b37b..a5ac51c3f1482c13b055843daf3d74b065764cfc 100644
--- a/tools/json_schema_compiler/cpp_bundle_generator.py
+++ b/tools/json_schema_compiler/cpp_bundle_generator.py
@@ -79,9 +79,15 @@ class CppBundleGenerator(object):
for platform in model_object.platforms:
if platform == Platforms.CHROMEOS:
ifdefs.append('defined(OS_CHROMEOS)')
+ elif platform == Platforms.LINUX:
+ ifdefs.append('defined(OS_LINUX)')
+ elif platform == Platforms.MAC:
+ ifdefs.append('defined(OS_MACOSX)')
+ elif platform == Platforms.WIN:
+ ifdefs.append('defined(OS_WIN)')
else:
raise ValueError("Unsupported platform ifdef: %s" % platform.name)
- return ' and '.join(ifdefs)
+ return ' || '.join(ifdefs)
def _GenerateRegisterFunctions(self, namespace_name, function):
c = code.Code()
« no previous file with comments | « ipc/ipc_message_start.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698