summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-18 18:03:06 -0700
committerElliott Hughes <enh@google.com>2014-07-18 18:25:08 -0700
commit0546008a51b3a9e40d7ab5d2c6c0d6e064a345a2 (patch)
tree1eeec565c9cf0ba9d39d56decd73586f58ad39d4
parent3bbaa29066a684d01df42ddf0365266e59f2dc44 (diff)
downloadomap3-0546008a51b3a9e40d7ab5d2c6c0d6e064a345a2.tar.gz
Always #include <sys/...>, not <linux/...>.android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-preview
(cherry picked from commit ea563325a91b2e9bf1e3623a2f6d91414dc292c2) Change-Id: I3a40ca73cb432d54ab1270400e2883a25c8ce3f2
-rw-r--r--omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c2
-rw-r--r--omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c2
-rw-r--r--omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c2
-rw-r--r--omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c
index 4c65d9b..4a94f93 100644
--- a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c
+++ b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c
@@ -78,7 +78,7 @@
#ifdef ANDROID
#include <utils/threads.h>
-#include <linux/prctl.h>
+#include <sys/prctl.h>
#endif
#include "OMX_AacDec_Utils.h"
diff --git a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c
index a9c21e3..c5938a0 100644
--- a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c
+++ b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c
@@ -77,7 +77,7 @@
#ifdef ANDROID
#include <utils/threads.h>
-#include <linux/prctl.h>
+#include <sys/prctl.h>
#endif
#include "OMX_Mp3Dec_Utils.h"
diff --git a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c
index 3541b1a..1e73d4e 100644
--- a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c
+++ b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c
@@ -67,7 +67,7 @@
#ifdef ANDROID
#include <sys/resource.h>
#include <utils/threads.h>
-#include <linux/prctl.h>
+#include <sys/prctl.h>
#endif
#include "OMX_WbAmrDec_Utils.h"
#include "OMX_WbAmrDecoder.h"
diff --git a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
index 09c2969..ec01e73 100644
--- a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
+++ b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
@@ -49,7 +49,7 @@
#endif
#ifdef ANDROID
-#include <linux/prctl.h>
+#include <sys/prctl.h>
#endif
#include <pthread.h>