Chromium Code Reviews Chromium Code Reviews
Issue 8065017:
Upstream: Android's base.gyp and base.gypi (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: base/base.gyp |
| diff --git a/base/base.gyp b/base/base.gyp |
| index a4755e3b0743cc48ec37203c065bcaab37a362e3..6313d7b525b5b648da4c1f63c2056cfcafd8e45b 100644 |
| --- a/base/base.gyp |
| +++ b/base/base.gyp |
| @@ -27,6 +27,16 @@ |
| '../build/linux/system.gyp:gtk', |
| ], |
| }], |
| + # TODO(michaelbai): Override the dependencies to remove the icu.gyp, |
|
brettw
2011/09/28 19:49:28
I don't understand this comment, I don't see anyth
michaelbai
2011/09/28 21:22:11
It removed the base_i18n's dependence on 'icu' by
|
| + # this should be removed once icu supported |
| + ['OS == "android"', { |
| + 'dependencies=': [ |
|
brettw
2011/09/28 19:49:28
Why do we need these on Android and not other syst
michaelbai
2011/09/28 21:22:11
It because third_party/icu can not be built on And
|
| + 'base', |
| + 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| + ], |
| + 'sources=': [ |
| + ], |
| + }], |
| ], |
| 'export_dependent_settings': [ |
| 'base', |
| @@ -56,8 +66,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 +267,38 @@ |
| 'module_dir': 'base' |
| }, |
| 'conditions': [ |
| + ['OS == "android"', { |
| + # TODO(michaelbai): Override the dependencies to remove the icu.gyp, |
| + # this should be removed once icu supported |
| + '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!': [ |
| + # The belows are the files not compiled because of the missing icu. |
| + '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', |
| + # Removed the below once the fix upstreamed. |
| + 'memory/mru_cache_unittest.cc', |
| + 'process_util_unittest.cc', |
| + 'synchronization/cancellation_flag_unittest.cc', |
| + # Not linked because of the missing JNI. |
| + 'android/scoped_java_ref_unittest.cc', |
| + 'debug/stack_trace_unittest.cc', |
| + ], |
| + }], |
| ['use_glib==1', { |
| 'sources!': [ |
| 'file_version_info_unittest.cc', |
| @@ -369,6 +411,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', |
