Upstream Android V8 change.

Fix the Mac build. "_toolset" needs to be tested inside target_conditions now.

And there is no need to have -llog any more.

Review URL: http://codereview.chromium.org/8631012
Patch from Jing Zhao <jingzhao@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10057 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/build/common.gypi b/build/common.gypi
index 1597644..9129d01 100644 (file)
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -141,7 +141,7 @@
               }],
               # The ARM assembler assumes the host is 32 bits,
               # so force building 32-bit host tools.
-              ['host_arch=="x64"', {
+              ['host_arch=="x64" or OS=="android"', {
                 'target_conditions': [
                   ['_toolset=="host"', {
                     'cflags': ['-m32'],

diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 937edca..8fe9910 100644 (file)
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -27,15 +27,6 @@
 
 {
   'includes': ['../../build/common.gypi'],
-  'target_conditions': [
-    ['OS=="android" and _toolset=="target"', {
-      'link_settings': {
-        'libraries': [
-          '-llog',
-        ],
-      }
-    }],
-  ],
   'conditions': [
     ['use_system_v8==0', {
       'targets': [
@@ -648,10 +639,18 @@
                   '../../src/platform-posix.cc',
                 ],
                 'conditions': [
-                  ['host_os=="mac" and _toolset!="target"', {
-                    'sources': [
-                      '../../src/platform-macos.cc'
-                    ]
+                  ['host_os=="mac"', {
+                    'target_conditions': [
+                      ['_toolset=="host"', {
+                        'sources': [
+                          '../../src/platform-macos.cc'
+                        ]
+                      }, {
+                        'sources': [
+                          '../../src/platform-linux.cc'
+                        ]
+                      }],
+                    ],
                   }, {
                     'sources': [
                       '../../src/platform-linux.cc'