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

ppapi/ppapi_nacl.gyp

 # Copyright 2014 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.
 
 # This GYP file defines untrusted (NaCl) targets.  All targets in this
 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
 # requiring NaCl sources for building.
 
 {
   'includes': [
@@ skipping 121 matching lines @@
           '>(tc_lib_dir_pnacl_newlib)/libppapi.a',
         ],
         'sources': [
           '<@(test_common_source_files)',
           '<@(test_nacl_source_files)',
         ],
         'extra_args': [
           '--strip-all',
         ],
         'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
-        'create_nmf_flags': [
-          '--no-default-libpath',
-          '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
-        ],
         'create_nonsfi_test_nmf': 'tests/create_nonsfi_test_nmf.py',
       },
       'conditions': [
         ['(target_arch=="ia32" or target_arch=="x64") and disable_glibc==0', {
           'variables': {
             'build_glibc': 1,
             # 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',
             'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf',
           },
           'actions': [
           {
             'action_name': 'Generate GLIBC NMF and copy libs',
             # NOTE: create_nmf must be first, it is the script python executes
             # below.
             '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_flags)',
+              '--objdump=>(nacl_objdump)',
               '--output=>(nmf_glibc)',
               '--stage-dependencies=<(PRODUCT_DIR)',
             ],
             'conditions': [
               ['target_arch=="ia32"', {
                 'action': [
                   '--library-path=>(libdir_glibc32)',
                   '--library-path=>(tc_lib_dir_glibc32)',
                 ],
                 'inputs': ['>(out_glibc32)'],
@@ skipping 32 matching lines @@
               'action_name': 'Generate PNACL NEWLIB NMF',
               # NOTE: create_nmf must be first, it is the script python executes
               # below.
               'inputs': [
                 '>(create_nmf)',
               ],
               'outputs': ['>(nmf_pnacl)'],
               'action': [
                 'python',
                 '>@(_inputs)',
-                '>@(create_nmf_flags)',
                 '--output=>(nmf_pnacl)',
               ],
               'conditions': [
                 ['target_arch=="ia32"', {
                   'inputs': [
                     '>(out_pnacl_newlib_x86_32_nexe)',
                   ],
                 }],
                 ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
                   'inputs': [
@@ skipping 68 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_arm_nexe)'],
               'outputs': ['>(nmf_pnacl)'],
               'action': [
                 'python',
                 '>@(_inputs)',
-                '>@(create_nmf_flags)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
         ['disable_pnacl==0 and target_arch=="mipsel"', {
           'variables': {
             'build_pnacl_newlib': 1,
             'translate_pexe_with_build': 1,
             'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf',
           },
           # Shim is a dependency for the nexe because we pre-translate.
           'dependencies': [
             '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
           ],
           'actions': [
             {
               'action_name': 'Generate PNACL NEWLIB NMF',
               'inputs': ['>(create_nmf)', '>(out_pnacl_newlib_mips_nexe)'],
               'outputs': ['>(nmf_pnacl)'],
               'action': [
                 'python',
                 '>@(_inputs)',
-                '>@(create_nmf_flags)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
       ],
     },
   ],
 }