|
1 | | -From a27a92cbe9db50bceedfffeb43d12345209e4d75 Mon Sep 17 00:00:00 2001 |
| 1 | +From bb7beaa8dddf7d406de80cc6511abe942dfeabd6 Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Petko Bordjukov <bordjukov@gmail.com> |
3 | | -Date: Fri, 10 Jun 2016 08:57:29 +0300 |
4 | | -Subject: [PATCH 2/3] Disable building tests |
| 3 | +Date: Mon, 25 Jul 2016 00:04:07 +0300 |
| 4 | +Subject: [PATCH 2/3] Don't compile unnecessary stuff |
5 | 5 |
|
6 | 6 | --- |
7 | | - Makefile | 6 ++---- |
8 | | - build/all.gyp | 27 --------------------------- |
9 | | - 2 files changed, 2 insertions(+), 31 deletions(-) |
| 7 | + Makefile | 7 +------ |
| 8 | + gypfiles/all.gyp | 32 -------------------------------- |
| 9 | + 2 files changed, 1 insertion(+), 38 deletions(-) |
10 | 10 |
|
11 | 11 | diff --git a/Makefile b/Makefile |
12 | | -index a0c08a6..10b2924 100644 |
| 12 | +index 0f8f93a..68778e9 100644 |
13 | 13 | --- a/Makefile |
14 | 14 | +++ b/Makefile |
15 | | -@@ -258,11 +258,9 @@ NACL_ARCHES = nacl_ia32 nacl_x64 |
16 | | - GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ |
17 | | - build/shim_headers.gypi build/features.gypi build/standalone.gypi \ |
18 | | - build/toolchain.gypi build/all.gyp build/mac/asan.gyp \ |
| 15 | +@@ -264,12 +264,7 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ |
| 16 | + gypfiles/shim_headers.gypi gypfiles/features.gypi \ |
| 17 | + gypfiles/standalone.gypi \ |
| 18 | + gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \ |
19 | 19 | - test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \ |
20 | | -- test/unittests/unittests.gyp tools/gyp/v8.gyp \ |
| 20 | +- test/unittests/unittests.gyp src/v8.gyp \ |
21 | 21 | - tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ |
22 | | -+ tools/gyp/v8.gyp tools/parser-shell.gyp \ |
23 | | - buildtools/third_party/libc++abi/libc++abi.gyp \ |
| 22 | +- buildtools/third_party/libc++abi/libc++abi.gyp \ |
24 | 23 | - buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \ |
25 | | -+ buildtools/third_party/libc++/libc++.gyp \ |
26 | | - src/third_party/vtune/v8vtune.gyp src/d8.gyp |
| 24 | +- src/third_party/vtune/v8vtune.gyp src/d8.gyp |
| 25 | ++ src/v8.gyp tools/parser-shell.gyp src/d8.gyp |
27 | 26 |
|
28 | 27 | # If vtunejit=on, the v8vtune.gyp will be appended. |
29 | | -diff --git a/build/all.gyp b/build/all.gyp |
30 | | -index feaf4fe..96820a0 100644 |
31 | | ---- a/build/all.gyp |
32 | | -+++ b/build/all.gyp |
33 | | -@@ -8,11 +8,7 @@ |
34 | | - 'target_name': 'All', |
35 | | - 'type': 'none', |
36 | | - 'dependencies': [ |
37 | | -- '../samples/samples.gyp:*', |
38 | | - '../src/d8.gyp:d8', |
39 | | -- '../test/cctest/cctest.gyp:*', |
40 | | -- '../test/fuzzer/fuzzer.gyp:*', |
41 | | -- '../test/unittests/unittests.gyp:*', |
42 | | - ], |
43 | | - 'conditions': [ |
44 | | - ['component!="shared_library"', { |
45 | | -@@ -20,29 +16,6 @@ |
| 28 | + ifeq ($(vtunejit), on) |
| 29 | +diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp |
| 30 | +index ff1bea4..96820a0 100644 |
| 31 | +--- a/gypfiles/all.gyp |
| 32 | ++++ b/gypfiles/all.gyp |
| 33 | +@@ -16,38 +16,6 @@ |
46 | 34 | '../tools/parser-shell.gyp:parser-shell', |
47 | 35 | ], |
48 | 36 | }], |
| 37 | +- # These items don't compile for Android on Mac. |
| 38 | +- ['host_os!="mac" or OS!="android"', { |
| 39 | +- 'dependencies': [ |
| 40 | +- '../samples/samples.gyp:*', |
| 41 | +- '../test/cctest/cctest.gyp:*', |
| 42 | +- '../test/fuzzer/fuzzer.gyp:*', |
| 43 | +- '../test/unittests/unittests.gyp:*', |
| 44 | +- ], |
| 45 | +- }], |
49 | 46 | - ['test_isolation_mode != "noop"', { |
50 | 47 | - 'dependencies': [ |
51 | 48 | - '../test/bot_default.gyp:*', |
@@ -73,5 +70,5 @@ index feaf4fe..96820a0 100644 |
73 | 70 | } |
74 | 71 | ] |
75 | 72 | -- |
76 | | -2.8.3 |
| 73 | +2.9.0 |
77 | 74 |
|
0 commit comments