Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / tools / cr / cr / actions / gyp.py

diff --git a/src/tools/cr/cr/actions/gyp.py b/src/tools/cr/cr/actions/gyp.py
index b50e893..800453a 100644 (file)
--- a/src/tools/cr/cr/actions/gyp.py
+++ b/src/tools/cr/cr/actions/gyp.py
@@ -15,20 +15,22 @@ class GypPrepareOut(cr.PrepareOut):
   ENABLED = cr.Config.From(
       GYP_GENERATORS='ninja',
       GYP_GENERATOR_FLAGS='output_dir={CR_OUT_BASE} config={CR_BUILDTYPE}',
-      GPP_DEF_target_arch='{CR_ENVSETUP_ARCH}',
+      GYP_DEF_target_arch='{CR_ENVSETUP_ARCH}',
   )
 
-  def Prepare(self):
+  def UpdateContext(self):
     # Collapse GYP_DEFINES from all GYP_DEF prefixes
     gyp_defines = cr.context.Find('GYP_DEFINES') or ''
     for key, value in cr.context.exported.items():
       if key.startswith(GYP_DEFINE_PREFIX):
         gyp_defines += ' %s=%s' % (key[len(GYP_DEFINE_PREFIX):], value)
     cr.context['GYP_DEFINES'] = gyp_defines.strip()
+    if cr.context.verbose >= 1:
+      print cr.context.Substitute('GYP_DEFINES = {GYP_DEFINES}')
 
+  def Prepare(self):
     if cr.context.verbose >= 1:
       print cr.context.Substitute('Invoking gyp with {GYP_GENERATOR_FLAGS}')
-      print cr.context.Substitute('GYP_DEFINES = {GYP_DEFINES}')
 
     cr.Host.Execute(
         '{CR_SRC}/build/gyp_chromium',