From b4fde6b19f96099b41e6198988890e082996b9e9 Mon Sep 17 00:00:00 2001 From: Pawel Andruszkiewicz Date: Tue, 16 Jun 2015 14:44:09 +0200 Subject: [PATCH] [Common] GYP does not seem to support compound conditionals. Replaced with series of conditionals for different platforms. Change-Id: I89fe45266639a7530f6dd0342afe0400a1f6146c Signed-off-by: Pawel Andruszkiewicz --- src/common/common.gypi | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/common/common.gypi b/src/common/common.gypi index 59229ddc..1f56310a 100644 --- a/src/common/common.gypi +++ b/src/common/common.gypi @@ -8,12 +8,18 @@ }, 'target_defaults': { 'conditions': [ - ['extension_host_os != "mobile"' and - 'extension_host_os != "wearable"' and - 'extension_host_os != "tv"', { + ['extension_host_os != "mobile"', { 'sources/': [['exclude', '_mobile\\.cc$|mobile/']], 'includes/': [['exclude', '_mobile\\.gypi$|mobile/']], }], + ['extension_host_os != "wearable"', { + 'sources/': [['exclude', '_wearable\\.cc$|wearable/']], + 'includes/': [['exclude', '_wearable\\.gypi$|wearable/']], + }], + ['extension_host_os != "tv"', { + 'sources/': [['exclude', '_tv\\.cc$|tv/']], + 'includes/': [['exclude', '_tv\\.gypi$|tv/']], + }], ['extension_host_os != "desktop"', { 'sources/': [['exclude', '_desktop\\.cc$|desktop/']], 'includes/': [['exclude', '_desktop\\.gypi$|desktop/']], -- 2.34.1