Move ICU header part 2

icu.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'use_system_icu%': 0,
     'icu_use_data_file_flag%': 0,
   },
   'target_defaults': {
@@ skipping 11 matching lines @@
         'defines': [
           'U_USING_ICU_NAMESPACE=0',
         ],
         'conditions': [
           ['component=="static_library"', {
             'defines': [
               'U_STATIC_IMPLEMENTATION',
             ],
           }],
         ],
-        # TODO(mark): Looks like this is causing the "public" include
-        # directories to show up twice in some targets in this file.  Fix.
         'include_dirs': [
-          'public/common',
-          'public/i18n',
           'source/common',
           'source/i18n',
         ],
         'msvs_disabled_warnings': [4005, 4068, 4355, 4996, 4267],
       },
       'targets': [
         {
           'target_name': 'icudata',
           'type': 'static_library',
           'defines': [
@@ skipping 207 matching lines @@
             'source/i18n/zstrfmt.cpp',
             'source/i18n/ztrans.cpp',
           ],
           'defines': [
             'U_I18N_IMPLEMENTATION',
           ],
           'dependencies': [
             'icuuc',
           ],
           'direct_dependent_settings': {
-            # Use prepend (+) because the WebKit build needs to pick up these
-            # ICU headers instead of the ones in ../WebKit/JavaScriptCore/wtf,
-            # also in WebKit's include path.
-            # TODO(mark): The triple + is a bug.  It should be a double +.  It
-            # seems that a + is being chopped off when the "target" section is
-            # merged into "target_defaults".
-            'include_dirs+++': [
-              'public/i18n',
+            'include_dirs': [
+              'source/i18n',
             ],
           },
           'conditions': [
             [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
               # Since ICU wants to internally use its own deprecated APIs, don't
               # complain about it.
               'cflags': [
                 '-Wno-deprecated-declarations',
               ],
               'cflags_cc': [
@@ skipping 217 matching lines @@
             'source/common/uvectr64.cpp',
             'source/common/wintz.c',
           ],
           'defines': [
             'U_COMMON_IMPLEMENTATION',
           ],
           'dependencies': [
             'icudata',
           ],
           'direct_dependent_settings': {
-            # Use prepend (+) because the WebKit build needs to pick up these
-            # ICU headers instead of the ones in ../WebKit/JavaScriptCore/wtf,
-            # also in WebKit's include path.
-            # TODO(mark): The triple + is a bug.  It should be a double +.  It
-            # seems that a + is being chopped off when the "target" section is
-            # merged into "target_defaults".
-            'include_dirs+++': [
-              'public/common',
+            'include_dirs': [
+              'source/common',
             ],
             'conditions': [
               [ 'component=="static_library"', {
                 'defines': [
                   'U_STATIC_IMPLEMENTATION',
                 ],
               }],
             ],
           },
           'conditions': [
@@ skipping 100 matching lines @@
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
         },
         {
           'target_name': 'icui18n',
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
           'variables': {
-            'headers_root_path': 'public/i18n',
+            'headers_root_path': 'source/i18n',
             'header_filenames': [
               # This list can easily be updated using the command below:
-              # find third_party/icu/public/i18n -iname '*.h' \
+              # find third_party/icu/source/i18n/unicode -iname '*.h' \
               # -printf "'%p',\n" | \
-              # sed -e 's|third_party/icu/public/i18n/||' | sort -u
+              # sed -e 's|third_party/icu/source/i18n/||' | sort -u
               'unicode/basictz.h',
               'unicode/bmsearch.h',
               'unicode/bms.h',
               'unicode/calendar.h',
               'unicode/choicfmt.h',
               'unicode/coleitr.h',
               'unicode/colldata.h',
               'unicode/coll.h',
               'unicode/curramt.h',
               'unicode/currpinf.h',
@@ skipping 60 matching lines @@
           'includes': [
             '../../build/shim_headers.gypi',
           ],
         },
         {
           'target_name': 'icuuc',
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
           'variables': {
-            'headers_root_path': 'public/common',
+            'headers_root_path': 'source/common',
             'header_filenames': [
               # This list can easily be updated using the command below:
-              # find third_party/icu/public/common -iname '*.h' \
+              # find third_party/icu/source/common/unicode -iname '*.h' \
               # -printf "'%p',\n" | \
-              # sed -e 's|third_party/icu/public/common/||' | sort -u
+              # sed -e 's|third_party/icu/source/common/||' | sort -u
               'unicode/brkiter.h',
               'unicode/bytestream.h',
               'unicode/caniter.h',
               'unicode/chariter.h',
               'unicode/dbbi.h',
               'unicode/docmain.h',
               'unicode/dtintrv.h',
               'unicode/errorcode.h',
               'unicode/icudataver.h',
               'unicode/icuplug.h',
@@ skipping 76 matching lines @@
             ],
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
         },
       ],
     }],
   ],
 }