Rename _untrusted targets in third_party to use _nacl suffix

Previously NaCl targets were using _untrusted suffix which makes the
purpose of these targets hard to understand. This CL renames some targets in src/third_party.

Also removed toolsets field from modp_b64_nacl.gyp

Review URL: https://codereview.chromium.org/138673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245176 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 19 insertions, 20 deletions

diff --git a/third_party/jsoncpp/jsoncpp_untrusted.gyp b/third_party/jsoncpp/jsoncpp_nacl.gyp
index 88537bf..d60510c 100644
--- a/third_party/jsoncpp/jsoncpp_untrusted.gyp
+++ b/third_party/jsoncpp/jsoncpp_nacl.gyp
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -11,11 +11,11 @@
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
-          'target_name': 'jsoncpp_untrusted',
+          'target_name': 'jsoncpp_nacl',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
-            'nlib_target': 'libjsoncpp_untrusted.a',
+            'nlib_target': 'libjsoncpp_nacl.a',
             'build_newlib': 1,
           },
           'gcc_compile_flags': [
diff --git a/third_party/liblouis/liblouis_untrusted.gyp b/third_party/liblouis/liblouis_nacl.gyp
index 1ae8ea0..0721ec5 100644
--- a/third_party/liblouis/liblouis_untrusted.gyp
+++ b/third_party/liblouis/liblouis_nacl.gyp
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -33,11 +33,11 @@
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
-          'target_name': 'liblouis_untrusted',
+          'target_name': 'liblouis_nacl',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
-            'nlib_target': 'liblouis_untrusted.a',
+            'nlib_target': 'liblouis_nacl.a',
             'build_newlib': 1,
           },
           'compile_flags': [
@@ -68,7 +68,7 @@
           ],
         },
         {
-          'target_name': 'liblouis_nacl_wrapper_untrusted',
+          'target_name': 'liblouis_nacl_wrapper_nacl',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
@@ -106,8 +106,8 @@
           'link_flags': [
             '-lppapi',
             '-lppapi_cpp',
-            '-llouis_untrusted',
-            '-ljsoncpp_untrusted',
+            '-llouis_nacl',
+            '-ljsoncpp_nacl',
             '-lpthread',
             '-lnacl_io',
           ],
@@ -117,8 +117,8 @@
             '../../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
             '../../ppapi/native_client/native_client.gyp:ppapi_lib',
             '../../ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
-            '../jsoncpp/jsoncpp_untrusted.gyp:jsoncpp_untrusted',
-            'liblouis_untrusted',
+            '../jsoncpp/jsoncpp_nacl.gyp:jsoncpp_nacl',
+            'liblouis_nacl',
           ],
           'actions': [
             {
@@ -161,7 +161,7 @@
             'test_extension_dir': '<(DEPTH)/chrome/test/data/chromeos/liblouis_nacl',
           },
           'dependencies': [
-            'liblouis_nacl_wrapper_untrusted',
+            'liblouis_nacl_wrapper_nacl',
           ],
           'copies': [
             {
diff --git a/third_party/modp_b64/modp_b64_untrusted.gyp b/third_party/modp_b64/modp_b64_nacl.gyp
index c51ff05..cd0d210 100644
--- a/third_party/modp_b64/modp_b64_untrusted.gyp
+++ b/third_party/modp_b64/modp_b64_nacl.gyp
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -8,10 +8,10 @@
   ],
   'targets': [
     {
-      'target_name': 'modp_b64_untrusted',
+      'target_name': 'modp_b64_nacl',
       'type': 'none',
       'variables': {
-        'nlib_target': 'libmodp_b64_untrusted.a',
+        'nlib_target': 'libmodp_b64_nacl.a',
         'build_glibc': 0,
         'build_newlib': 1,
         'build_pnacl_newlib': 1,
@@ -19,7 +19,6 @@
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ],
-      'toolsets': ['host', 'target'],
       'sources': [
         'modp_b64.cc',
         'modp_b64.h',
diff --git a/third_party/opus/opus_untrusted.gyp b/third_party/opus/opus_nacl.gyp
index 6ec75d6..4ade702 100644
--- a/third_party/opus/opus_untrusted.gyp
+++ b/third_party/opus/opus_nacl.gyp
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -11,10 +11,10 @@
   ],
   'targets': [
     {
-      'target_name': 'opus_untrusted',
+      'target_name': 'opus_nacl',
       'type': 'none',
       'variables': {
-        'nlib_target': 'libopus_untrusted.a',
+        'nlib_target': 'libopus_nacl.a',
         'build_glibc': 0,
         'build_newlib': 0,
         'build_pnacl_newlib': 1,
@@ -39,6 +39,6 @@
       'sources/': [
         ['exclude', '/fixed/[^/]*_FIX.(h|c)$'],
       ],
-    },  # end of target 'opus_untrusted'
+    },  # end of target 'opus_nacl'
   ],
 }