Reviewers: rmcilroy,

Description:
Version 3.28.28.1 (merged r22467)

Fix the android_webview build's gyp files after the changes in r22444.

[email protected]
BUG=

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

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

Affected files (+6, -6 lines):
  M build/toolchain.gypi
  M src/version.cc


Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index 6cad1e2d0a2c233a0642a06e92a39cf3ffbf6b7f..8c6df83549d8e4544cc5e73ec2671bcda18eb391 100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -143,7 +143,7 @@
         'target_conditions': [
           ['_toolset=="host"', {
             'conditions': [
-              ['v8_target_arch==host_arch', {
+              ['v8_target_arch==host_arch and android_webview_build==0', {
                 # Host built with an Arm CXX compiler.
                 'conditions': [
                   [ 'arm_version==7', {
@@ -186,7 +186,7 @@
           }],  # _toolset=="host"
           ['_toolset=="target"', {
             'conditions': [
-              ['v8_target_arch==target_arch', {
+ ['v8_target_arch==target_arch and android_webview_build==0', {
                 # Target built with an Arm CXX compiler.
                 'conditions': [
                   [ 'arm_version==7', {
@@ -250,7 +250,7 @@
           'V8_TARGET_ARCH_MIPS',
         ],
         'conditions': [
-          ['v8_target_arch==target_arch', {
+          ['v8_target_arch==target_arch and android_webview_build==0', {
             # Target built with a Mips CXX compiler.
             'target_conditions': [
               ['_toolset=="target"', {
@@ -299,7 +299,7 @@
           'V8_TARGET_ARCH_MIPS',
         ],
         'conditions': [
-          ['v8_target_arch==target_arch', {
+          ['v8_target_arch==target_arch and android_webview_build==0', {
             # Target built with a Mips CXX compiler.
             'target_conditions': [
               ['_toolset=="target"', {
@@ -354,7 +354,7 @@
           'V8_TARGET_ARCH_MIPS64',
         ],
         'conditions': [
-          ['v8_target_arch==target_arch', {
+          ['v8_target_arch==target_arch and android_webview_build==0', {
             # Target built with a Mips CXX compiler.
             'target_conditions': [
               ['_toolset=="target"', {
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 33876608f976b48015d5f638edee31b31d8883b0..e5b38b4ac6d837832b3775b61ab3280afc6e1dcf 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     28
 #define BUILD_NUMBER      28
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // 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