Rename ICU NaCl targets

icu_untrusted.gyp

Index: icu_untrusted.gyp
diff --git a/icu_untrusted.gyp b/icu_untrusted.gyp
deleted file mode 100644
index 26c52934ad24615584d7f6c7d5b163f77e975ae8..0000000000000000000000000000000000000000
--- a/icu_untrusted.gyp
+++ /dev/null
@@ -1,108 +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': [
-    'icu.gypi',
-    '../../native_client/build/untrusted.gypi',
-  ],
-  'target_defaults': {
-    'direct_dependent_settings': {
-      'defines': [
-        # Tell ICU to not insert |using namespace icu;| into its headers,
-        # so that chrome's source explicitly has to use |icu::|.
-        'U_USING_ICU_NAMESPACE=0',
-      ],
-    },
-    'defines': [
-      'U_USING_ICU_NAMESPACE=0',
-      'U_STATIC_IMPLEMENTATION',
-    ],
-    'include_dirs': [
-      'source/common',
-      'source/i18n',
-    ],
-    'pnacl_compile_flags': [
-      '-Wno-char-subscripts',
-      '-Wno-deprecated-declarations',
-      '-Wno-header-hygiene',
-      '-Wno-logical-op-parentheses',
-      '-Wno-return-type-c-linkage',
-      '-Wno-switch',
-      '-Wno-tautological-compare',
-      '-Wno-unused-variable'
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'icudata_untrusted',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libicudata_untrusted.a',
-        'build_glibc': 0,
-        'build_newlib': 0,
-        'build_pnacl_newlib': 1,
-      },
-      'sources': [
-        'source/stubdata/stubdata.c',
-      ],
-      'dependencies': [
-        '../../native_client/tools.gyp:prep_toolchain',
-      ],
-    },
-    {
-      'target_name': 'icui18n_untrusted',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libicui18n_untrusted.a',
-        'build_glibc': 0,
-        'build_newlib': 0,
-        'build_pnacl_newlib': 1,
-      },
-      'sources': [
-        '<@(icui18n_sources)',
-      ],
-      'defines': [
-        'U_I18N_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../../native_client/tools.gyp:prep_toolchain',
-        'icuuc_untrusted',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'source/i18n',
-        ],
-      },
-    },
-    {
-      'target_name': 'icuuc_untrusted',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libicuuc_untrusted.a',
-        'build_glibc': 0,
-        'build_newlib': 0,
-        'build_pnacl_newlib': 1,
-      },
-      'sources': [
-        '<@(icuuc_sources)',
-      ],
-      'defines': [
-        'U_COMMON_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../../native_client/tools.gyp:prep_toolchain',
-        'icudata_untrusted',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'source/common',
-        ],
-        'defines': [
-          'U_STATIC_IMPLEMENTATION',
-        ],
-      },
-    },
-  ],
-}