From f136e8fcb7dbc368d55ac76ec5d39b69968dfec7 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Wed, 4 Jun 2014 15:21:26 +0000 Subject: [PATCH] Fix building android gn BUG=none TBR=machenbach@chromium.org LOG=n Review URL: https://codereview.chromium.org/313923002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21678 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- BUILD.gn | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 2caf0c0..2fe4579 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -976,8 +976,14 @@ executable("mksnapshot") { ":v8_nosnapshot", ] + libs = [] + if (v8_compress_startup_data == "bz2") { - libs = [ "bz2" ] + libs += [ "bz2" ] + } + + if (is_android && current_toolchain != host_toolchain) { + libs += [ "log" ] } } @@ -1004,10 +1010,6 @@ component("v8") { ] } - if (is_android && current_toolchain != host_toolchain) { - libs = [ "log" ] - } - configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":internal_config", ":features", ":toolchain" ] -- 2.7.4