Fix build error with tcmalloc for android

Fix build error with tcmalloc for android

malloc_usable_size has been changed in android ndk header.
(https://code.google.com/p/android/issues/detail?id=55725)
so to override the function properly, this header should be changed too.

BUG=162208
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270993

[JungJik, 2014-05-13 10:55:59]

Please PTAL :)

[willchan no longer on Chromium, 2014-05-14 11:30:03]

+gperftools maintainer

LGTM

[JungJik, 2014-05-15 02:01:03]

The CQ bit was checked by jungjik.lee@samsung.com

[JungJik, 2014-05-15 02:01:05]

The CQ bit was unchecked by jungjik.lee@samsung.com

[JungJik, 2014-05-15 03:44:58]

The CQ bit was checked by jungjik.lee@samsung.com

[commit-bot: I haz the power, 2014-05-15 03:46:10]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jungjik.lee@samsung.com/284843002/1

[commit-bot: I haz the power, 2014-05-15 05:36:01]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)

[commit-bot: I haz the power, 2014-05-15 05:39:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-15 05:39:28]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)

[JungJik, 2014-05-16 00:52:07]

The CQ bit was checked by jungjik.lee@samsung.com

[commit-bot: I haz the power, 2014-05-16 00:52:58]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jungjik.lee@samsung.com/284843002/1

[commit-bot: I haz the power, 2014-05-16 00:58:00]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-16 00:58:00]

Failed to apply patch for
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h:
While running svn add @master --force --config-dir
/b/infra_internal/commit_queue/subversion_config --non-interactive;
  svn: '@master' is just a peg revision. Maybe try '@master@' instead?

Patch:      
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
diff --git
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
index
3b858caa444261e5d36e6586fb3f39eb46c29907..2204dfd50738808af959a9ef9b33ac2620a83a85
100644
--- a/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
+++ b/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
@@ -94,7 +94,12 @@ extern "C" {
   struct mallinfo mallinfo(void) __THROW          ALIAS(tc_mallinfo);
 #endif
   size_t malloc_size(void* p) __THROW             ALIAS(tc_malloc_size);
+#if defined(__ANDROID__)
+  size_t malloc_usable_size(const void* p) __THROW
+         ALIAS(tc_malloc_size);
+#else
   size_t malloc_usable_size(void* p) __THROW      ALIAS(tc_malloc_size);
+#endif
 }   // extern "C"
 
 #undef ALIAS

[JungJik, 2014-05-16 01:05:57]

The CQ bit was checked by jungjik.lee@samsung.com

[commit-bot: I haz the power, 2014-05-16 01:08:07]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jungjik.lee@samsung.com/284843002/1

[commit-bot: I haz the power, 2014-05-16 01:13:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-16 01:13:18]

Failed to apply patch for
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h:
While running svn add @master --force --config-dir
/b/infra_internal/commit_queue/subversion_config --non-interactive;
  svn: '@master' is just a peg revision. Maybe try '@master@' instead?

Patch:      
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
diff --git
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
index
3b858caa444261e5d36e6586fb3f39eb46c29907..2204dfd50738808af959a9ef9b33ac2620a83a85
100644
--- a/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
+++ b/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
@@ -94,7 +94,12 @@ extern "C" {
   struct mallinfo mallinfo(void) __THROW          ALIAS(tc_mallinfo);
 #endif
   size_t malloc_size(void* p) __THROW             ALIAS(tc_malloc_size);
+#if defined(__ANDROID__)
+  size_t malloc_usable_size(const void* p) __THROW
+         ALIAS(tc_malloc_size);
+#else
   size_t malloc_usable_size(void* p) __THROW      ALIAS(tc_malloc_size);
+#endif
 }   // extern "C"
 
 #undef ALIAS

[JungJik, 2014-05-16 10:44:35]

On 2014/05/16 01:13:18, I haz the power (commit-bot) wrote:
> Failed to apply patch for
> @master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h:
> While running svn add @master --force --config-dir
> /b/infra_internal/commit_queue/subversion_config --non-interactive;
>   svn: '@master' is just a peg revision. Maybe try '@master@' instead?
> 
> Patch:      
> @master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
> Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
> diff --git
> @master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
> @master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
> index
>
3b858caa444261e5d36e6586fb3f39eb46c29907..2204dfd50738808af959a9ef9b33ac2620a83a85
> 100644
> --- a/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
> +++ b/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
> @@ -94,7 +94,12 @@ extern "C" {
>    struct mallinfo mallinfo(void) __THROW          ALIAS(tc_mallinfo);
>  #endif
>    size_t malloc_size(void* p) __THROW             ALIAS(tc_malloc_size);
> +#if defined(__ANDROID__)
> +  size_t malloc_usable_size(const void* p) __THROW
> +         ALIAS(tc_malloc_size);
> +#else
>    size_t malloc_usable_size(void* p) __THROW      ALIAS(tc_malloc_size);
> +#endif
>  }   // extern "C"
>  
>  #undef ALIAS

Could you help me? Is this a commit-bot problem?

[JungJik, 2014-05-16 10:44:42]

The CQ bit was checked by jungjik.lee@samsung.com

[commit-bot: I haz the power, 2014-05-16 10:45:05]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jungjik.lee@samsung.com/284843002/1

[commit-bot: I haz the power, 2014-05-16 10:45:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-16 10:45:53]

Failed to apply patch for
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h:
While running svn add @master --force --config-dir
/b/infra_internal/commit_queue/subversion_config --non-interactive;
  svn: '@master' is just a peg revision. Maybe try '@master@' instead?

Patch:      
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
diff --git
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
index
3b858caa444261e5d36e6586fb3f39eb46c29907..2204dfd50738808af959a9ef9b33ac2620a83a85
100644
--- a/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
+++ b/@master/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
@@ -94,7 +94,12 @@ extern "C" {
   struct mallinfo mallinfo(void) __THROW          ALIAS(tc_mallinfo);
 #endif
   size_t malloc_size(void* p) __THROW             ALIAS(tc_malloc_size);
+#if defined(__ANDROID__)
+  size_t malloc_usable_size(const void* p) __THROW
+         ALIAS(tc_malloc_size);
+#else
   size_t malloc_usable_size(void* p) __THROW      ALIAS(tc_malloc_size);
+#endif
 }   // extern "C"
 
 #undef ALIAS

[Paweł Hajdan Jr., 2014-05-16 11:47:10]

The CQ bit was checked by phajdan.jr@chromium.org

[commit-bot: I haz the power, 2014-05-16 11:47:24]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jungjik.lee@samsung.com/284843002/1

[commit-bot: I haz the power, 2014-05-16 11:48:16]

Change committed as 270993

[JungJik, 2014-05-17 13:51:19]

On 2014/05/16 11:47:10, Paweł Hajdan Jr. wrote:
> The CQ bit was checked by mailto:phajdan.jr@chromium.org

Thanks for your help. :)