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

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index a4755e3b0743cc48ec37203c065bcaab37a362e3..f4ee873fb8e26008f649608803cc4df35b9cf6d1 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -27,6 +27,18 @@
             '../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',
@@ -56,8 +68,8 @@
         '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',
       ],
@@ -257,6 +269,41 @@
         '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',
@@ -369,6 +416,7 @@
         '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',