From 84ef659584d3beb83b44cc168d02244dbd6b8f87 Mon Sep 17 00:00:00 2001 From: Wojciech Bielawski Date: Tue, 2 Mar 2021 17:46:16 +0000 Subject: [PATCH] Make grit's target platform compatible with python 3. Since python 3.3 sys.platform doesn't contain the major version on linux. Bug: 1112471 Change-Id: I29bad863bbb04f30eaa727263502a0650ba5785e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2718153 Reviewed-by: Dirk Pranke Reviewed-by: Scott Graham Commit-Queue: Dirk Pranke Cr-Commit-Position: refs/heads/master@{#859035} --- tools/grit/grit/node/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/grit/grit/node/base.py b/tools/grit/grit/node/base.py index 521f779ad3c07d..7f373b4cab400c 100644 --- a/tools/grit/grit/node/base.py +++ b/tools/grit/grit/node/base.py @@ -499,8 +499,8 @@ def EvaluateExpression(cls, expr, defs, target_platform, extra_variables={}): elif name == 'is_bsd': value = 'bsd' in target_platform elif name == 'is_posix': - value = (target_platform in ('darwin', 'linux2', 'linux3', 'sunos5', - 'android', 'ios') + value = (target_platform.startswith('linux') + or target_platform in ('darwin', 'sunos5', 'android', 'ios') or 'bsd' in target_platform) elif name == 'pp_ifdef':