Revision: 23181
Author:   [email protected]
Date:     Tue Aug 19 08:27:33 2014 UTC
Log:      Fix Android build.

BUG=v8:3506
LOG=N
[email protected]

Review URL: https://codereview.chromium.org/486123002
http://code.google.com/p/v8/source/detail?r=23181

Modified:
 /branches/bleeding_edge/build/android.gypi
/branches/bleeding_edge/test/compiler-unittests/instruction-selector-unittest.h

=======================================
--- /branches/bleeding_edge/build/android.gypi  Tue Aug  5 13:23:55 2014 UTC
+++ /branches/bleeding_edge/build/android.gypi  Tue Aug 19 08:27:33 2014 UTC
@@ -87,7 +87,6 @@
           '-pthread',  # Not supported by Android toolchain.
         ],
         'cflags': [
-          '-U__linux__',  # Don't allow toolchain to claim -D__linux__
           '-ffunction-sections',
           '-funwind-tables',
           '-fstack-protector',
=======================================
--- /branches/bleeding_edge/test/compiler-unittests/instruction-selector-unittest.h Thu Aug 14 06:33:50 2014 UTC +++ /branches/bleeding_edge/test/compiler-unittests/instruction-selector-unittest.h Tue Aug 19 08:27:33 2014 UTC
@@ -130,11 +130,11 @@
       ConstantMap::const_iterator i;
       if (operand->IsConstant()) {
         i = constants_.find(operand->index());
-        EXPECT_NE(constants_.end(), i);
+        EXPECT_FALSE(constants_.end() == i);
       } else {
         EXPECT_EQ(InstructionOperand::IMMEDIATE, operand->kind());
         i = immediates_.find(operand->index());
-        EXPECT_NE(immediates_.end(), i);
+        EXPECT_FALSE(immediates_.end() == i);
       }
       EXPECT_EQ(operand->index(), i->first);
       return i->second;

--
--
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