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

- Added upstreamed files for Android platform.
- Excluded the files related to icu and JNI, because third_party/icu
  can't compiled and JNI files have been uploaded yet.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8065017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103723 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 120 insertions, 5 deletions

diff --git a/base/base.gyp b/base/base.gyp
index a4755e3..be675a8 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -27,6 +27,40 @@
             '../build/linux/system.gyp:gtk',
           ],
         }],
+        # TODO(michaelbai): This should be removed once icu supported 
+        ['OS == "android"', {
+          'dependencies!': [
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
+          ],
+          '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/time_formatting.cc',
+            'i18n/time_formatting.h',
+          ],
+        }],
       ],
       'export_dependent_settings': [
         'base',
@@ -56,8 +90,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 +291,34 @@
         'module_dir': 'base'
       },
       'conditions': [
+        ['OS == "android"', {
+          # TODO(michaelbai): This should be removed once icu supported
+          'dependencies!': [
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
+          ],
+          '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 +431,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',
diff --git a/base/base.gypi b/base/base.gypi
index 94cf15b6..c447842 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -43,6 +43,7 @@
           'base_export.h',
           'base_paths.cc',
           'base_paths.h',
+          'base_paths_android.cc',
           'base_paths_mac.h',
           'base_paths_mac.mm',
           'base_paths_linux.cc',
@@ -78,6 +79,7 @@
           'debug/profiler.h',
           'debug/stack_trace.cc',
           'debug/stack_trace.h',
+          'debug/stack_trace_android.cc',
           'debug/stack_trace_posix.cc',
           'debug/stack_trace_win.cc',
           'debug/trace_event_win.cc',
@@ -94,6 +96,7 @@
           'file_path.h',
           'file_util.cc',
           'file_util.h',
+          'file_util_android.cc',
           'file_util_deprecated.h',
           'file_util_linux.cc',
           'file_util_mac.mm',
@@ -110,6 +113,7 @@
           'files/file_path_watcher.h',
           'files/file_path_watcher_linux.cc',
           'files/file_path_watcher_mac.cc',
+          'files/file_path_watcher_stub.cc',
           'files/file_path_watcher_win.cc',
           'float_util.h',
           'format_macros.h',
@@ -194,6 +198,8 @@
           'native_library_win.cc',
           'observer_list.h',
           'observer_list_threadsafe.h',
+          'os_compat_android.cc',
+          'os_compat_android.h',
           'path_service.cc',
           'path_service.h',
           'pickle.cc',
@@ -228,6 +234,7 @@
           'sha1_portable.cc',
           'sha1_win.cc',
           'shared_memory.h',
+          'shared_memory_android.cc',
           'shared_memory_posix.cc',
           'shared_memory_win.cc',
           'spin_wait.h',
@@ -265,6 +272,7 @@
           'synchronization/waitable_event_win.cc',
           'system_monitor/system_monitor.cc',
           'system_monitor/system_monitor.h',
+          'system_monitor/system_monitor_android.cc',
           'system_monitor/system_monitor_mac.mm',
           'system_monitor/system_monitor_posix.cc',
           'system_monitor/system_monitor_win.cc',
@@ -417,6 +425,24 @@
               ],
             },
           ],
+          [ 'OS == "android"', {
+            'sources/': [
+              ['exclude', '^debug/stack_trace.cc'],
+              ['exclude', '^debug/stack_trace_posix.cc'],
+              ['exclude', '^system_monitor/system_monitor_posix.cc'],
+              ['include', '^native_library_linux.cc'],
+              ['include', '^process_util_linux.cc'],
+              ['include', '^sys_info_linux.cc'],
+              ['include', '^sys_string_conversions_linux.cc'],
+              ['include', '^worker_pool_linux.cc'],
+              # TODO(michaelbai): The below files are excluded because of the
+              # missing JNI, add them back when JNI is ready.
+              ['exclude', '^android/'],
+              ['exclude', '^message_pump_android.cc'],
+              ['exclude', '^base_paths_android.cc'],
+              ['exclude', '^debug/stack_trace_android.cc'],
+            ],
+          }],
           [ 'OS != "mac"', {
               'sources!': [
                 'mac/scoped_aedesc.h'
@@ -447,6 +473,7 @@
             'sources!': [
               'event_recorder_stubs.cc',
               'file_descriptor_shuffle.cc',
+              'files/file_path_watcher_stub.cc',
               'message_pump_libevent.cc',
               # Not using sha1_win.cc because it may have caused a
               # regression to page cycler moz.
@@ -454,11 +481,13 @@
               'string16.cc',
             ],
           },],
-          ['os_posix==1 and OS!="linux" and OS!="mac"', {
+          [ 'OS == "linux"', {
             'sources!': [
-              'files/file_path_watcher_linux.cc',
+              'files/file_path_watcher_stub.cc',
             ],
-            'sources': [
+          }],
+          [ 'OS == "mac"', {
+            'sources!': [
               'files/file_path_watcher_stub.cc',
             ],
           }],
@@ -536,6 +565,27 @@
               ['exclude', '_nss\.cc$'],
             ],
         }],
+        [ 'OS == "android"', {
+          'dependencies': [
+            'symbolize',
+            '../third_party/ashmem/ashmem.gyp:ashmem#target',
+          ],
+          'defines': [
+            'USE_SYMBOLIZE',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-llog',
+            ],
+          },
+          'conditions': [
+            [ '_toolset=="host" and host_os=="linux"', {
+              'dependencies': [
+                '../build/linux/system.gyp:glib',
+              ],
+            }],
+          ],
+        }],
         [ 'OS == "freebsd" or OS == "openbsd"', {
           'link_settings': {
             'libraries': [
@@ -600,6 +650,8 @@
         'linux_util.h',
         'md5.cc',
         'md5.h',
+        'message_pump_android.cc',
+        'message_pump_android.h',
         'message_pump_glib.cc',
         'message_pump_glib.h',
         'message_pump_gtk.cc',