From 5c13171ab2b2c2d507e72c3cc1b293f0da3514c4 Mon Sep 17 00:00:00 2001
From: "sergeyu@chromium.org"
 <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 16 Jan 2014 06:43:35 +0000
Subject: 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
---
 third_party/modp_b64/modp_b64_nacl.gyp      | 29 ++++++++++++++++++++++++++++
 third_party/modp_b64/modp_b64_untrusted.gyp | 30 -----------------------------
 2 files changed, 29 insertions(+), 30 deletions(-)
 create mode 100644 third_party/modp_b64/modp_b64_nacl.gyp
 delete mode 100644 third_party/modp_b64/modp_b64_untrusted.gyp

(limited to 'third_party/modp_b64')

diff --git a/third_party/modp_b64/modp_b64_nacl.gyp b/third_party/modp_b64/modp_b64_nacl.gyp
new file mode 100644
index 0000000..cd0d210
--- /dev/null
+++ b/third_party/modp_b64/modp_b64_nacl.gyp
@@ -0,0 +1,29 @@
+# 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.
+
+{
+  'includes': [
+    '../../native_client/build/untrusted.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'modp_b64_nacl',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libmodp_b64_nacl.a',
+        'build_glibc': 0,
+        'build_newlib': 1,
+        'build_pnacl_newlib': 1,
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+      ],
+      'sources': [
+        'modp_b64.cc',
+        'modp_b64.h',
+        'modp_b64_data.h',
+      ],
+    },
+  ],
+}
diff --git a/third_party/modp_b64/modp_b64_untrusted.gyp b/third_party/modp_b64/modp_b64_untrusted.gyp
deleted file mode 100644
index c51ff05..0000000
--- a/third_party/modp_b64/modp_b64_untrusted.gyp
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 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': [
-    '../../native_client/build/untrusted.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'modp_b64_untrusted',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libmodp_b64_untrusted.a',
-        'build_glibc': 0,
-        'build_newlib': 1,
-        'build_pnacl_newlib': 1,
-      },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
-      'toolsets': ['host', 'target'],
-      'sources': [
-        'modp_b64.cc',
-        'modp_b64.h',
-        'modp_b64_data.h',
-      ],
-    },
-  ],
-}
-- 
cgit v1.1