Support Android in MallocHook for mmap, munmap and mremap.

third_party/tcmalloc/chromium/src/base/linux_syscall_support.h

Index: third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
index d768471b33fee93b6fa7ecda7bdbd87c497d0d25..6d7b77258007260d2069d49a65a76928e812103c 100644
--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
@@ -155,7 +155,12 @@ extern "C" {
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#if defined(__ANDROID__) || defined(ANDROID)

[digit1, 2013/05/13 16:14:42]

__ANDROID__ should be defined by the toolchain automatically, so I think
checking for it should be enough in all cases :)

(and if not, the gyp files should be changed to add __ANDROID__ when using a
broken compiler that doesn't).

[Dai Mikurube (NOT FULLTIME), 2013/05/13 21:25:52]

Got it.  Removed defined(ANDROID) from this patch.

+#include <sys/syscall.h>
+#include <sys/linux-syscalls.h>
+#else
 #include <syscall.h>
+#endif
 #include <unistd.h>
 #include <linux/unistd.h>
 #include <endian.h>
@@ -471,6 +476,11 @@ struct kernel_stat {
 };
 #endif
 
+// ulong is not defined in Android while used to define __llseek.

[digit1, 2013/05/13 16:14:42]

How, do you have more information about this? I'm thinking of filing an NDK bug
for this.

[Dai Mikurube (NOT FULLTIME), 2013/05/13 16:36:06]

I'm not confident.  What I know is:
* uint is defined in /android-14/arch-arm/usr/include/sys/types.h
* ulong is not there
* in normal Linux, both are defined in /usr/include/sys/types.h

If it is fixed in future, I'm adding a TODO to remove it in future.

+#if defined(__ANDROID__) || defined(ANDROID)
+typedef unsigned long int ulong;
+#endif
+
 
 /* Definitions missing from the standard header files                        */
 #ifndef O_DIRECTORY
@@ -1961,7 +1971,8 @@ struct kernel_stat {
       return LSS_NAME(wait4)(pid, status, options, 0);
     }
    #endif
-  #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+  #if (defined(__i386__) || defined(__x86_64__) || defined(__arm__)) && \
+      !defined(__ANDROID__) && !defined(ANDROID)
     LSS_INLINE _syscall4(int, openat, int, d, const char *, p, int, f, int, m)
   #endif
   LSS_INLINE int LSS_NAME(sigemptyset)(struct kernel_sigset_t *set) {