commit c08b4f03896ac996dcd83b5d37f80198e69fc37c
author Elliott Hughes <enh@google.com> Tue Sep 23 02:09:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 02:09:15 2014 +0000
tree 1d9524adcb2283bb3d32dd5d773acc59a1fcab87
parent 43928a00fbe5df89d488a85694379995b1d2a8c6
parent 50bd6b99796e1ec8d688e5867bfe487d50e21372

am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"

* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
  build: remove HAVE_OOM_ADJ

core/combo/include/arch/linux-arm64/AndroidConfig.h

diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h
index 2d6d40e..778e563 100644
--- a/core/combo/include/arch/linux-arm64/AndroidConfig.h
+++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h
@@ -50,13 +50,6 @@
 #define HAVE_FORKEXEC
 
 /*
- * Process out-of-memory adjustment.  Set if running on Linux,
- * where we can write to /proc/<pid>/oom_adj to modify the out-of-memory
- * badness adjustment.
- */
-#define HAVE_OOM_ADJ
-
-/*
  * IPC model.  Choose one:
  *
  * HAVE_SYSV_IPC - use the classic SysV IPC mechanisms (semget, shmget).

core/combo/include/arch/linux-mips64/AndroidConfig.h

diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h
index 5493efe..f038120 100644
--- a/core/combo/include/arch/linux-mips64/AndroidConfig.h
+++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h
@@ -50,13 +50,6 @@
 #define HAVE_FORKEXEC
 
 /*
- * Process out-of-memory adjustment.  Set if running on Linux,
- * where we can write to /proc/<pid>/oom_adj to modify the out-of-memory
- * badness adjustment.
- */
-#define HAVE_OOM_ADJ
-
-/*
  * IPC model.  Choose one:
  *
  * HAVE_SYSV_IPC - use the classic SysV IPC mechanisms (semget, shmget).