From 0184fe514978732eb92b0169fe084839d5fd60a2 Mon Sep 17 00:00:00 2001
From: "ulan@chromium.org"
 <ulan@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 26 Feb 2013 15:41:04 +0000
Subject: [PATCH] [Android] Fix v8_shell compilation for Android component
 build.

r12883 was in complete because the library was included for host and
target. Restrict to just target.

BUG=chromium:158821

Review URL: https://chromiumcodereview.appspot.com/12314118
Patch from Yaron Friedman <yfriedman@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13734 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 tools/gyp/v8.gyp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index dfd1269..c57c52b 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -68,8 +68,8 @@
                   'USING_V8_SHARED',
                 ],
               },
-              'conditions': [
-                ['OS=="android"', {
+              'target_conditions': [
+                ['OS=="android" and _toolset=="target"', {
                   'libraries': [
                     '-llog',
                   ],
@@ -77,6 +77,8 @@
                     'src/common/android/include',
                   ],
                 }],
+              ],
+              'conditions': [
                 ['OS=="mac"', {
                   'xcode_settings': {
                     'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']
-- 
2.7.4