[NaCl SDK] build_sdk uses gyp to build, not scons. *

chrome/test/data/nacl/nacl_browser_test.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../../../native_client/build/untrusted.gypi',
   ],
   'target_defaults': {
     # We need to override the variables in untrusted.gypi outside of a
     # target_condition block because the target_condition block in
     # untrusted gypi is fully evaluated and interpolated before any of the
     # target_condition blocks in this file are expanded.  This means that any
     # variables overriden inside a target_condition block in this file will not
     # affect the values in untrusted.gypi.
     'variables': {
       'test_files': [],
       'nacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/newlib',
       'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe',
       'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe',
       'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe',
       'nmf_newlib': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
       'nacl_glibc_out_dir': '<(PRODUCT_DIR)/nacl_test_data/glibc',
       'out_glibc32': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe',
       'out_glibc64': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe',
       'out_glibc_arm': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe',
       'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
     },
     'dependencies': [
+       '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
        '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
        '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
     ],
     'target_conditions': [
       ['test_files!=[] and build_newlib==1', {
         'copies': [
           {
             'destination': '>(nacl_newlib_out_dir)',
             'files': [
               '>@(test_files)',
@@ skipping 82 matching lines @@
                   '>@(_inputs)',
                   '--objdump=>(nacl_objdump)',
                   '--output=>(nmf_glibc)',
                   '--path-prefix=>(nexe_target)_libs',
                   '--stage-dependencies=<(nacl_glibc_out_dir)',
                   '--toolchain=glibc',
                 ],
                 'target_conditions': [
                   ['enable_x86_64==1', {
                     'inputs': ['>(out_glibc64)'],
-                    'action': ['--library-path=>(libdir_glibc64)'],
+                    'action': [
+                      '--library-path=>(libdir_glibc64)',
+                      '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',

[noelallen1, 2012/09/21 23:20:25]

Are you using anything that's not in the SDK here?  If not, then we should find
a way to do with without additional library paths.  And why isn't newlib
affected?

[binji, 2012/09/24 17:59:56]

Presently, all untrusted .a and .so files are built into this new directory.
They are only copied into the same directory as the untarred toolchain as an SDK
build step.

I suppose we could have a naclsdk target and have these tests depend on it.
newlib doesn't need the library path, because it doesn't have shared libraries.

+                    ],
                   }],
                   ['enable_x86_32==1', {
                     'inputs': ['>(out_glibc32)'],
-                    'action': ['--library-path=>(libdir_glibc32)'],
+                    'action': [
+                      '--library-path=>(libdir_glibc32)',
+                      '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
+                    ],
                   }],
                   # TODO(ncbray) handle arm case.  We don't have ARM glibc yet.
                 ],
               },
             ],
           }],
         ],
       }],
     ],
   },
-}
+}