From b2bb11d26c98c6e951d1e492a45017b0ac5bdb25 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Mon, 13 May 2013 16:25:46 +0200 Subject: Fix build with toplevel-dir Change-Id: I3fcbf166978cf20f7a07d7e6bda135864054e9c1 Reviewed-by: Zeno Albisser --- chromium/tools/gyp/pylib/gyp/generator/ninja.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/chromium/tools/gyp/pylib/gyp/generator/ninja.py b/chromium/tools/gyp/pylib/gyp/generator/ninja.py index a40c7fe2464..a1692348873 100644 --- a/chromium/tools/gyp/pylib/gyp/generator/ninja.py +++ b/chromium/tools/gyp/pylib/gyp/generator/ninja.py @@ -1473,8 +1473,13 @@ def CalculateVariables(default_variables, params): default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') default_variables.setdefault('SHARED_LIB_DIR', os.path.join('$!PRODUCT_DIR', 'lib')) + # Take into account the fact that toplevel_dir might not be equal to depth + toplevel_offset = '' + if 'options' in params: + options = params['options'] + toplevel_offset = os.path.relpath(options.depth, options.toplevel_dir) default_variables.setdefault('LIB_DIR', - os.path.join('$!PRODUCT_DIR', 'obj')) + os.path.join('$!PRODUCT_DIR', 'obj', toplevel_offset)) def ComputeOutputDir(params): """Returns the path from the toplevel_dir to the build output directory.""" -- cgit v1.2.1