diff options
author | Henrik Nord <[email protected]> | 2014-03-21 16:39:02 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2014-03-21 16:39:05 +0100 |
commit | a4030a89eb9a22d250dba2793f274f8731126ea8 (patch) | |
tree | 620592b3560f98be67f71f70fd5596cc110ecd70 /lib/os_mon/c_src/memsup.c | |
parent | c9da6c2f06efa410462299a20e10206843082ac8 (diff) | |
parent | f43a1dc55d42de3097f75ca65baead9a2ff05c78 (diff) | |
download | otp-a4030a89eb9a22d250dba2793f274f8731126ea8.tar.gz otp-a4030a89eb9a22d250dba2793f274f8731126ea8.tar.bz2 otp-a4030a89eb9a22d250dba2793f274f8731126ea8.zip |
Merge branch 'fogfish/embedded-arm-android'
* fogfish/embedded-arm-android:
Raspberry PI / Android a minimal cross-compile configuration
OTP-11805
Diffstat (limited to 'lib/os_mon/c_src/memsup.c')
-rw-r--r-- | lib/os_mon/c_src/memsup.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/os_mon/c_src/memsup.c b/lib/os_mon/c_src/memsup.c index b5114d10ed..409db84aa7 100644 --- a/lib/os_mon/c_src/memsup.c +++ b/lib/os_mon/c_src/memsup.c @@ -324,7 +324,7 @@ get_mem_procfs(memory_ext *me){ /* arch specific functions */ -#if defined(__linux__) /* ifdef SYSINFO */ +#if defined(__linux__) && !defined(__ANDROID__)/* ifdef SYSINFO */ /* sysinfo does not include cached memory which is a problem. */ static int get_extended_mem_sysinfo(memory_ext *me) { @@ -395,8 +395,12 @@ get_extended_mem_sgi(memory_ext *me) { static void get_extended_mem(memory_ext *me) { +/* android */ +#if defined(__ANDROID__) + if (get_mem_procfs(me)) return; + /* linux */ -#if defined(__linux__) +#elif defined(__linux__) if (get_mem_procfs(me)) return; if (get_extended_mem_sysinfo(me)) return; |