Revert of [NaCl SDK] Remove create_nmf dependency on NACL_SDK_ROOT env var

ppapi/ppapi_nacl_test_common.gypi

 # Copyright (c) 2013 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': [
     '../build/common_untrusted.gypi',
   ],
   'target_defaults': {
     # We need to override the variables in untrusted.gypi outside of a
@@ skipping 92 matching lines @@
             '-lppapi_cpp',
             '-lppapi',
             '-pthread',
           ],
           'extra_args': [
             '--strip-all',
           ],
           'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
           'create_nmf_args_portable%': [],
           'create_nonsfi_test_nmf': '<(DEPTH)/ppapi/tests/create_nonsfi_test_nmf.py',
-          'create_nmf_args': [
-            '--no-default-libpath',
-            '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
-          ],
         },
         'target_conditions': [
           ['generate_nmf==1 and build_newlib==1', {
             'actions': [
               {
                 'action_name': 'Generate NEWLIB NMF',
                 'inputs': ['>(create_nmf)'],
                 'outputs': ['>(nmf_newlib)'],
                 'action': [
                   'python',
                   '>(create_nmf)',
-                  '>@(create_nmf_args)',
                   '--output=>(nmf_newlib)',
                   '>@(create_nmf_args_portable)',
                 ],
                 'target_conditions': [
                   ['enable_x86_64==1', {
                     'inputs': ['>(out_newlib64)'],
                     'action': ['>(out_newlib64)'],
                   }],
                   ['enable_x86_32==1', {
                     'inputs': ['>(out_newlib32)'],
@@ skipping 10 matching lines @@
                 ],
               },
             ],
           }],
           ['"<(target_arch)"!="arm" and "<(target_arch)"!="mipsel" and generate_nmf==1 and disable_glibc==0 and build_glibc==1', {
             'variables': {
               # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
               # doesn't work on Windows.
               'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
               'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
+              'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
             },
             'actions': [
               {
                 'action_name': 'Generate GLIBC NMF and copy libs',
                 'inputs': ['>(create_nmf)'],
                 # NOTE: There is no explicit dependency for the lib32
                 # and lib64 directories created in the PRODUCT_DIR.
                 # They are created as a side-effect of NMF creation.
                 'outputs': ['>(nmf_glibc)'],
                 'action': [
                   'python',
                   '>@(_inputs)',
-                  '>@(create_nmf_args)',
+                  '--objdump=>(nacl_objdump)',
                   '--output=>(nmf_glibc)',
                   '--path-prefix=>(nexe_target)_libs',
                   '--stage-dependencies=<(nacl_glibc_out_dir)',
                   '>@(create_nmf_args_portable)',
                 ],
                 'target_conditions': [
                   ['enable_x86_64==1', {
                     'inputs': ['>(out_glibc64)'],
                     'action': [
                       '--library-path=>(libdir_glibc64)',
@@ skipping 16 matching lines @@
             'actions': [
               {
                 'action_name': 'Generate PNACL NEWLIB NMF',
                 # NOTE: create_nmf must be first, it is the script python
                 # executes below.
                 'inputs': ['>(create_nmf)', '>(out_pnacl_newlib)'],
                 'outputs': ['>(nmf_pnacl_newlib)'],
                 'action': [
                   'python',
                   '>(create_nmf)',
-                  '>@(create_nmf_args)',
                   '--output=>(nmf_pnacl_newlib)',
                   '>(out_pnacl_newlib)',
                   '>@(create_nmf_args_portable)',
                 ],
               },
             ],
           }],
           ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0 and (enable_x86_32_nonsfi==1 or enable_arm_nonsfi==1)', {
             'actions': [
               {
@@ skipping 23 matching lines @@
                   }],
                 ],
               },
             ],
           }],
         ],
       }],
     ],
   },
 }