commit de0f6c1a68666f723f5ebb12c83ee918eef9e789
author Ben Murdoch <benm@google.com> Thu Jun 07 11:14:56 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 07 11:14:56 2012 -0700
tree bda290f11911391fd7677c826b9803e72e1094b5
parent c31a0898275384a6c87f0c483ee1c8f357c78472
parent a28cdeeef5f062a40c344cbbbcf296873391bc58

am a28cdeee: Remove Android specific LUMP_OF_MEMORY.

* commit 'a28cdeeef5f062a40c344cbbbcf296873391bc58':
  Remove Android specific LUMP_OF_MEMORY.

V8_MERGE_REVISION

diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION
index 0b33891..612a114 100644
--- a/V8_MERGE_REVISION
+++ b/V8_MERGE_REVISION
@@ -1,2 +1,4 @@
 V8 3.9.24.29
 http://v8.googlecode.com/svn/branches/3.9@11646
+
+Note local edits to src/heap.cc, see http://codereview.chromium.org/10541053/

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index 48e8b56..f2e2bc0 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -67,10 +67,14 @@
     : isolate_(NULL),
 // semispace_size_ should be a power of 2 and old_generation_size_ should be
 // a multiple of Page::kPageSize.
-#if defined(ANDROID)
-#define LUMP_OF_MEMORY (128 * KB)
-      code_range_size_(0),
-#elif defined(V8_TARGET_ARCH_X64)
+
+// ANDROID
+//#if defined(ANDROID)
+//#define LUMP_OF_MEMORY (128 * KB)
+//      code_range_size_(0),
+//#elif defined(V8_TARGET_ARCH_X64)
+// END ANDROID
+#if defined(V8_TARGET_ARCH_X64)
 #define LUMP_OF_MEMORY (2 * MB)
       code_range_size_(512*MB),
 #else