nacl: Be more consistent about setting nacl_untrusted_build on targets that use untrusted.gypi

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': [
     '../build/common_untrusted.gypi',
     'ppapi_sources.gypi',
   ],
   'targets': [
     {
       'target_name': 'ppapi_cpp_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_cpp.a',
         'nso_target': 'libppapi_cpp.so',
+        'nacl_untrusted_build': 1,
         'build_glibc': 1,
         'build_newlib': 1,
         'build_pnacl_newlib': 1,
         'sources': [
           '<@(cpp_source_files)',
           'cpp/module_embedder.h',
           'cpp/ppp_entrypoints.cc',
         ],
       },
     },
     {
       'target_name': 'ppapi_gles2_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_gles2.a',
+        'nacl_untrusted_build': 1,
         'nso_target': 'libppapi_gles2.so',
         'build_glibc': 1,
         'build_newlib': 1,
         'build_pnacl_newlib': 1,
         'include_dirs': [
           'lib/gl/include',
         ],
         'sources': [
           'lib/gl/gles2/gl2ext_ppapi.c',
           'lib/gl/gles2/gl2ext_ppapi.h',
@@ skipping 23 matching lines @@
         # We compile with --strip-all under extra_args so debug info is
         # discarded anyway.  Remove this and the --strip-all flag if
         # debug info is really needed.
         'compile_flags!': [
           '-g',
         ],
         'defines': [
           'GL_GLEXT_PROTOTYPES',
         ],
         'nexe_target': 'ppapi_nacl_tests',
+        'nacl_untrusted_build': 1,
         'build_newlib': 1,
         'include_dirs': [
           'lib/gl/include',
           '..',
         ],
         'link_flags': [
           '-lppapi_cpp',
           '-lppapi',
           '-pthread',
         ],
@@ skipping 259 matching lines @@
                 '>@(create_nmf_flags)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
       ],
     },
   ],
 }