From: ulan@chromium.org <ulan@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 19 Aug 2014 08:27:33 +0000 (+0000)
Subject: Fix Android build.
X-Git-Tag: upstream/4.7.83~7568
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96038b718312dc7706a44d98c1328855e1e7e090;p=platform%2Fupstream%2Fv8.git

Fix Android build.

BUG=v8:3506
LOG=N
R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/486123002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23181 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/build/android.gypi b/build/android.gypi
index 46ece08..f984ea3 100644
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -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',
diff --git a/test/compiler-unittests/instruction-selector-unittest.h b/test/compiler-unittests/instruction-selector-unittest.h
index 5a4273f..124bc42 100644
--- a/test/compiler-unittests/instruction-selector-unittest.h
+++ b/test/compiler-unittests/instruction-selector-unittest.h
@@ -130,11 +130,11 @@ class InstructionSelectorTest : public CompilerTest {
       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;