Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(732)

Unified Diff: tools/gyp/v8.gyp

Issue 12314118: [Android] Fix v8_shell compilation for Android component build. (Closed) Base URL: https://chromium.googlesource.com/external/v8.git@master
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index dfd1269508b9014e3056ed4d66b8d131c262ba51..c57c52b89aa18560b2d91505323fbf280661775e 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']
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698