diff options
| author | Ben Murdoch <benm@google.com> | 2012-06-07 11:17:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 11:17:12 -0700 |
| commit | aedeec13588ee14f62728510437f9064cb9ccc11 (patch) | |
| tree | fec974ae15de5bf1738e44ee11203b79a1472f0c | |
| parent | b073973cff82f494f901dd64df00747584481e98 (diff) | |
| parent | de0f6c1a68666f723f5ebb12c83ee918eef9e789 (diff) | |
| download | android_external_v8-aedeec13588ee14f62728510437f9064cb9ccc11.tar.gz android_external_v8-aedeec13588ee14f62728510437f9064cb9ccc11.tar.bz2 android_external_v8-aedeec13588ee14f62728510437f9064cb9ccc11.zip | |
am de0f6c1a: am a28cdeee: Remove Android specific LUMP_OF_MEMORY.
* commit 'de0f6c1a68666f723f5ebb12c83ee918eef9e789':
Remove Android specific LUMP_OF_MEMORY.
| -rw-r--r-- | V8_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | src/heap.cc | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION index 0b33891a..612a1142 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/ diff --git a/src/heap.cc b/src/heap.cc index 48e8b567..f2e2bc08 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -67,10 +67,14 @@ Heap::Heap() : 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 |