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

Unified Diff: build/all.gyp

Issue 1879793002: Fix android_arm build hosted on Mac (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Fix Windows build break Created 4 years, 8 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 | « Makefile.android ('k') | build/standalone.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index feaf4fecccabf569ba16c0fcaba14d7c9c10b03a..ff1bea4b61137fddf5ffc5aedcd8b5259d3e96ad 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -8,11 +8,7 @@
'target_name': 'All',
'type': 'none',
'dependencies': [
- '../samples/samples.gyp:*',
'../src/d8.gyp:d8',
- '../test/cctest/cctest.gyp:*',
- '../test/fuzzer/fuzzer.gyp:*',
- '../test/unittests/unittests.gyp:*',
],
'conditions': [
['component!="shared_library"', {
@@ -20,6 +16,15 @@
'../tools/parser-shell.gyp:parser-shell',
],
}],
+ # These items don't compile for Android on Mac.
+ ['host_os!="mac" or OS!="android"', {
+ 'dependencies': [
+ '../samples/samples.gyp:*',
+ '../test/cctest/cctest.gyp:*',
+ '../test/fuzzer/fuzzer.gyp:*',
+ '../test/unittests/unittests.gyp:*',
+ ],
+ }],
['test_isolation_mode != "noop"', {
'dependencies': [
'../test/bot_default.gyp:*',
« no previous file with comments | « Makefile.android ('k') | build/standalone.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698