From e7d0c7cb539de756514d028851619076dac2d59d Mon Sep 17 00:00:00 2001 From: "wjia@google.com" Date: Fri, 22 Jul 2011 00:49:35 +0000 Subject: [PATCH] fix gyp when build with Chromium. Review URL: http://webrtc-codereview.appspot.com/89003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@242 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/build/common.gypi | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/build/common.gypi b/src/build/common.gypi index 53431750ae..032fb2f11a 100644 --- a/src/build/common.gypi +++ b/src/build/common.gypi @@ -10,8 +10,18 @@ { 'variables': { - # TODO(ajm): use webrtc_standalone to match NaCl? - 'build_with_chromium%': 1, # 1 to build webrtc with chromium + # Putting a variables dict inside another variables dict looks kind of + # weird. This is done so that 'build_with_chromium' is defined as + # variable within the outer variables dict here. This is necessary + # to get these variables defined for the conditions within this variables + # dict that operate on these variables (e.g., for setting + # 'include_pulse_audio', we need to have 'build_with_chromium' already set). + 'variables': { + # TODO(ajm): use webrtc_standalone to match NaCl? + 'build_with_chromium%': 1, # 1 to build webrtc with chromium + }, + + 'build_with_chromium%': '<(build_with_chromium)', # Selects fixed-point code where possible. # TODO(ajm): we'd like to set this based on the target OS/architecture.