Reviewers: Michael Achenbach,

Description:
Version 3.27.19.3 (merged r21678)

Fix building android gn

[email protected]
BUG=

Please review this at https://codereview.chromium.org/311113003/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files (+8, -6 lines):
  M BUILD.gn
  M src/version.cc


Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 2caf0c0fc391a3f05ba65f7f8889acbb3dca1606..2fe4579f15e73e132de3f4f652642ec52f519229 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" ]
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 701264b772c13fd5838867b6f23bb9053633385d..95081d1e11a1af0dfb233b227138b54833e65da6 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     27
 #define BUILD_NUMBER      19
-#define PATCH_LEVEL       2
+#define PATCH_LEVEL       3
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to