Allows base to be built for host on android.

base/base.gypi

 # 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 435 matching lines @@
           [ 'OS == "android"', {
             'sources!': [
               'files/file_path_watcher_kqueue.cc',
               'debug/stack_trace.cc',
               'debug/stack_trace_posix.cc',
               'system_monitor/system_monitor_posix.cc',
             ],
             'sources/': [
               ['include', '^process_util_linux\\.cc$'],
               ['include', '^sys_info_linux\\.cc$'],
+              ['include', '^sys_string_conversions_posix.cc'],

[Mark Mentovai, 2011/11/18 19:03:16]

Follow the pattern of the lines around you. Fully quote the regular expression,
so . becomes \\., and anchor the end with $.

[bulach, 2011/11/21 12:48:13]

Done.

               ['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"', {
@@ skipping 127 matching lines @@
           'export_dependent_settings': [
             '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:x11',
           ],
         }, {  # use_glib!=1
             'sources/': [
               ['exclude', '/xdg_user_dirs/'],
               ['exclude', '_nss\.cc$'],
             ],
         }],
-        [ 'OS == "android"', {
+        [ 'OS == "android" and _toolset == "host"', {
+          # Base for host support is the minimum required to run the
+          # ssl false start blacklist tool. We'll require further changes

[Mark Mentovai, 2011/11/18 19:03:16]

Avoid using “we” and “our” incomments.

[bulach, 2011/11/21 12:48:13]

Done.

+          # to generically support host builds (and tests).
+          # Note: when building for host, gyp has OS == "android",
+          # hence the *_android.cc files are included but the actual code
+          # doesn't have OS_ANDROID / ANDROID defined.
+          'conditions': [
+            ['host_os == "linux"', {
+              'sources/': [
+                ['include', 'atomicops_internals_x86_gcc\\.cc'],

[Mark Mentovai, 2011/11/18 19:03:16]

^$ anchors on each end.

[bulach, 2011/11/21 12:48:13]

Done.

+              ],
+              'dependencies': [
+                '../build/linux/system.gyp:glib',
+              ],
+              'export_dependent_settings': [
+                '../build/linux/system.gyp:glib',
+              ],
+            }],
+            ['host_os == "mac"', {
+              'sources/': [
+                ['exclude', '^native_library_linux.cc'],

[Mark Mentovai, 2011/11/18 19:03:16]

\\. and $ through line 629.

[michaelbai, 2011/11/18 23:58:16]

Hi Mark,

Should 'sources!' be used here instead of regular expression?

On 2011/11/18 19:03:16, Mark Mentovai wrote:

[bulach, 2011/11/21 12:48:13]

Done.

[bulach, 2011/11/21 12:48:13]

afaict, the order that 'sources', 'sources!' and 'sources!' are evaluated are
slightly different. I tried with 'sources!' but it didn't work...

[Mark Mentovai, 2011/11/21 13:33:55]

michaelbai wrote:
It can be if it works but doesn’t have to be.

Because of the processing order, sources! may not work. sources! doesn’t work if
a sources/ includes the file. In that case, you need to exclude it by a sources/
exclude that follows the include.

+                ['exclude', '^process_util_linux.cc'],
+                ['exclude', '^sys_info_linux.cc'],
+                ['exclude', '^sys_string_conversions_linux.cc'],
+                ['exclude', '^worker_pool_linux.cc'],
+              ],
+            }],
+          ],
+        }],
+        [ 'OS == "android" and _toolset == "target"', {
           'dependencies': [
             'symbolize',
-            '../third_party/ashmem/ashmem.gyp:ashmem#target',
+            '../third_party/ashmem/ashmem.gyp:ashmem',
           ],
           'defines': [
             'USE_SYMBOLIZE',
           ],
           'link_settings': {
             'libraries': [
               '-llog',
             ],
           },
-          'conditions': [
-            [ '_toolset=="host" and host_os=="linux"', {
-              'dependencies': [
-                '../build/linux/system.gyp:glib',
-              ],
-            }],
+          'sources!': [
+            'debug/stack_trace.cc',
+            'debug/stack_trace_posix.cc',
           ],
         }],
         [ 'os_bsd==1', {
           'include_dirs': [
             '/usr/local/include',
           ],
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
               ],
@@ skipping 204 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }