Upstream: Android's base.gyp and base.gypi

base/base.gyp

 # Copyright (c) 2011 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': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
     'base.gypi',
   ],
   'targets': [
     {
       'target_name': 'base_i18n',
       'type': '<(component)',
       'dependencies': [
         'base',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'conditions': [
         ['toolkit_uses_gtk==1', {
           'dependencies': [
             # i18n/rtl.cc uses gtk
             '../build/linux/system.gyp:gtk',
           ],
         }],
+        # TODO(michaelbai): Remove the below condition once the icu supported.
+        ['OS == "android"', {
+          # Removed the dependence on icu.gyp by overriding
+          # 'dependencies', third_party/icu can be compiled on Android now. 

[brettw, 2011/09/28 21:38:49]

This sentence doesn't make any sense.

[michaelbai, 2011/09/28 23:04:34]

Done.

+          'dependencies=': [

[brettw, 2011/09/28 21:38:49]

You seem to be writing this assuming that this will override and replace the
dependencies defined in the topmost section. But if that were true, wouldn't
toolkit_uses_gtk then not have ICU or even base? This ends up merging the
dependencies.

[michaelbai, 2011/09/28 21:45:36]

Yes, To completely remove the ICU is what I want now because the third_party/icu
can not be compiled now.

On 2011/09/28 21:38:49, brettw wrote:

[brettw, 2011/09/28 21:47:50]

As I explained in the comment, what you wrote does not override and replace the
dependencies in the topmost section. It merges.

[michaelbai, 2011/09/28 23:04:34]

As we discussed, I changed to use exclude list

On 2011/09/28 21:47:50, brettw wrote:

+            'base',
+            'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+          ],
+          # Removed all sources files because of the missing icu.
+          'sources=': [
+          ],
+        }],
       ],
       'export_dependent_settings': [
         'base',
       ],
       'defines': [
         'BASE_I18N_IMPLEMENTATION',
       ],
       'sources': [
         'i18n/base_i18n_export.h',
         'i18n/bidi_line_iterator.cc',
         'i18n/bidi_line_iterator.h',
         'i18n/break_iterator.cc',
         'i18n/break_iterator.h',
         'i18n/char_iterator.cc',
         'i18n/char_iterator.h',
         'i18n/case_conversion.cc',
         'i18n/case_conversion.h',
         'i18n/file_util_icu.cc',
         'i18n/file_util_icu.h',
         'i18n/icu_encoding_detection.cc',
         'i18n/icu_encoding_detection.h',
         'i18n/icu_string_conversions.cc',
         'i18n/icu_string_conversions.h',
         'i18n/icu_util.cc',
         'i18n/icu_util.h',
         'i18n/number_formatting.cc',
         'i18n/number_formatting.h',
         'i18n/rtl.cc',
         'i18n/rtl.h',
-        'i18n/string_search.cc',
-        'i18n/string_search.h',
+        'i18n/string_search.cc',
+        'i18n/string_search.h',
         'i18n/time_formatting.cc',
         'i18n/time_formatting.h',
       ],
     },
     {
       # This is the subset of files from base that should not be used with a
       # dynamic library. Note that this library cannot depend on base because
       # base depends on base_static.
       'target_name': 'base_static',
       'type': 'static_library',
@@ skipping 179 matching lines @@
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'includes': ['../build/nocompile.gypi'],
       'variables': {
          # TODO(ajwong): Is there a way to autodetect this?
         'module_dir': 'base'
       },
       'conditions': [
+        ['OS == "android"', {
+          # TODO(michaelbai): The below removed the dependence on icu.gyp by
+          # overriding 'dependencies' because the third_party/icu can be
+          # compiled on Android now. This should be removed once icu is ready. 
+          'dependencies=': [
+            'base',
+            'base_i18n',
+            'base_static',
+            'test_support_base',
+            'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../testing/gmock.gyp:gmock',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'sources!': [
+            # TODO(michaelbai): The belows are excluded because of the missing
+            # icu and should be added back once icu is ready.
+            'i18n/break_iterator_unittest.cc',
+            'i18n/char_iterator_unittest.cc',
+            'i18n/case_conversion_unittest.cc',
+            'i18n/file_util_icu_unittest.cc',
+            'i18n/icu_string_conversions_unittest.cc',
+            'i18n/number_formatting_unittest.cc',
+            'i18n/rtl_unittest.cc',
+            'i18n/string_search_unittest.cc',
+            'i18n/time_formatting_unittest.cc',
+            # TODO(michaelbai): Removed the below once the fix upstreamed.
+            'memory/mru_cache_unittest.cc',
+            'process_util_unittest.cc',
+            'synchronization/cancellation_flag_unittest.cc',
+            # TODO(michaelbai): The below files are excluded because of the
+            # missing JNI and should be added back once JNI is ready.
+            'android/scoped_java_ref_unittest.cc',
+            'debug/stack_trace_unittest.cc',
+          ],
+        }],
         ['use_glib==1', {
           'sources!': [
             'file_version_info_unittest.cc',
           ],
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
                   'allocator/allocator.gyp:allocator',
                 ],
               },
@@ skipping 92 matching lines @@
         'test/scoped_locale.h',
         'test/test_file_util.h',
         'test/test_file_util_linux.cc',
         'test/test_file_util_mac.cc',
         'test/test_file_util_posix.cc',
         'test/test_file_util_win.cc',
         'test/test_reg_util_win.cc',
         'test/test_reg_util_win.h',
         'test/test_suite.cc',
         'test/test_suite.h',
+        'test/test_stub_android.cc',
         'test/test_switches.cc',
         'test/test_switches.h',
         'test/test_timeouts.cc',
         'test/test_timeouts.h',
         'test/thread_test_helper.cc',
         'test/thread_test_helper.h',
       ],
     },
     {
       'target_name': 'test_support_perf',
@@ skipping 36 matching lines @@
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
       ],
     }],
   ],
 }