diff options
| author | Yang Guo <yangguo@chromium.org> | 2018-04-05 15:17:56 +0200 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2018-04-11 13:23:30 -0400 |
| commit | 3fb8abf637cf5f1b3db4198f1a92eb09b4ad28f4 (patch) | |
| tree | fb61b5fa056da089f30012129762ea121163888a /common.gypi | |
| parent | 3e6ff8589442fddcd15828c272bf68c26c30d951 (diff) | |
| download | android-node-v8-3fb8abf637cf5f1b3db4198f1a92eb09b4ad28f4.tar.gz android-node-v8-3fb8abf637cf5f1b3db4198f1a92eb09b4ad28f4.tar.bz2 android-node-v8-3fb8abf637cf5f1b3db4198f1a92eb09b4ad28f4.zip | |
tools: implement ninja build with --build-v8-with-gn
PR-URL: https://github.com/nodejs/node/pull/19201
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 7d6ec8da26..6d83d8a2a1 100644 --- a/common.gypi +++ b/common.gypi @@ -49,7 +49,13 @@ 'conditions': [ ['GENERATOR=="ninja"', { 'obj_dir': '<(PRODUCT_DIR)/obj', - 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/libv8_base.a', + 'conditions': [ + [ 'build_v8_with_gn=="true"', { + 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/v8_monolith.gen/gn/obj/libv8_monolith.a', + }, { + 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/libv8_base.a', + }], + ] }, { 'obj_dir%': '<(PRODUCT_DIR)/obj.target', 'v8_base': '<(PRODUCT_DIR)/obj.target/deps/v8/gypfiles/libv8_base.a', |