Skip to content

Commit 41dc58b

Browse files
committed
Remove include <linux/android_pmem.h>
Also remove unused mSize variable from struct. This file is not needed and does not exist in the uapi kernel headers. Bug: 11559337 Change-Id: I428276745a6a98f1144d4fff56de3aec7c826986
1 parent 6b84726 commit 41dc58b

6 files changed

+0
-13
lines changed

camera/QCameraHWI.h

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include <QComOMXMetadata.h>
3636

3737
extern "C" {
38-
#include <linux/android_pmem.h>
3938
#include <linux/msm_ion.h>
4039
#include <mm_camera_interface2.h>
4140
#include "mm_omx_jpeg_encoder.h"

camera/QCameraHWI_Mem.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
#include <fcntl.h>
3232
#include <cutils/properties.h>
3333
#include <math.h>
34-
#if HAVE_ANDROID_OS
35-
#include <linux/android_pmem.h>
36-
#endif
3734
#include <linux/ioctl.h>
3835
#include "QCameraParameters.h"
3936
#include <media/mediarecorder.h>

camera/QCameraHWI_Mem.h

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "QCamera_Intf.h"
2626

2727
extern "C" {
28-
#include <linux/android_pmem.h>
2928
#include <linux/msm_ion.h>
3029
}
3130

@@ -86,7 +85,6 @@ class PmemPool : public MemPool {
8685
int myOffset;
8786
int mCameraControlFd;
8887
uint32_t mAlignedSize;
89-
struct pmem_region mSize;
9088
};
9189

9290
class IonPool : public MemPool {

camera/QCameraHWI_Parm.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
#include <fcntl.h>
3030
#include <cutils/properties.h>
3131
#include <math.h>
32-
#if HAVE_ANDROID_OS
33-
#include <linux/android_pmem.h>
34-
#endif
3532
#include <linux/ioctl.h>
3633
#include "QCameraParameters.h"
3734
#include <media/mediarecorder.h>

camera/QualcommCameraHardware.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
#include <fcntl.h>
3939
#include <cutils/properties.h>
4040
#include <math.h>
41-
#if HAVE_ANDROID_OS
42-
#include <linux/android_pmem.h>
43-
#endif
4441
#include <linux/ioctl.h>
4542
#include "QCameraParameters.h"
4643
#include <media/mediarecorder.h>

camera/QualcommCameraHardware.h

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include "QCamera_Intf.h"
4040

4141
extern "C" {
42-
#include <linux/android_pmem.h>
4342
#include <linux/ion.h>
4443
#include <mm_camera_interface.h>
4544
}

0 commit comments

Comments
 (0)