diff options
| author | Refael Ackermann <refack@gmail.com> | 2019-03-24 22:58:29 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-03-28 16:39:16 -0400 |
| commit | 3b5773fee389c52077bd9f2dd324739af27fb6b5 (patch) | |
| tree | a3967e13f38c431ab1ab9ca3dbfcb102e0bd0526 /common.gypi | |
| parent | 3d8b844112bf6526ce126ecaec85f83b31a0a9aa (diff) | |
| download | android-node-v8-3b5773fee389c52077bd9f2dd324739af27fb6b5.tar.gz android-node-v8-3b5773fee389c52077bd9f2dd324739af27fb6b5.tar.bz2 android-node-v8-3b5773fee389c52077bd9f2dd324739af27fb6b5.zip | |
build,deps: move gypfiles out 2/2 - moving
* move all used files to `tools/v8_gypfiles` directory
* fix references in node configuration
PR-URL: https://github.com/nodejs/node/pull/26685
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/common.gypi b/common.gypi index 80ed796a39..23ac7205ba 100644 --- a/common.gypi +++ b/common.gypi @@ -80,16 +80,10 @@ }], ['GENERATOR=="ninja"', { 'obj_dir': '<(PRODUCT_DIR)/obj', - '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', - }], - ] + 'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_base.a', }, { 'obj_dir%': '<(PRODUCT_DIR)/obj.target', - 'v8_base': '<(PRODUCT_DIR)/obj.target/deps/v8/gypfiles/libv8_base.a', + 'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_base.a', }], ['OS == "win"', { 'os_posix': 0, @@ -104,15 +98,6 @@ 'obj_dir%': '<(PRODUCT_DIR)/obj.target', 'v8_base': '<(PRODUCT_DIR)/libv8_base.a', }], - ['build_v8_with_gn == "true"', { - 'conditions': [ - ['GENERATOR == "ninja"', { - 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/v8_monolith.gen/gn/obj/libv8_monolith.a', - }, { - 'v8_base': '<(PRODUCT_DIR)/obj.target/v8_monolith/geni/gn/obj/libv8_monolith.a', - }], - ], - }], ['openssl_fips != ""', { 'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)', }, { |