OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
[android-x86/frameworks-base.git]
/
core
/
jni
/
android_hardware_camera2_CameraMetadata.cpp
diff --git
a/core/jni/android_hardware_camera2_CameraMetadata.cpp
b/core/jni/android_hardware_camera2_CameraMetadata.cpp
index
d8eb7d2
..
fad5b0e
100644
(file)
--- a/
core/jni/android_hardware_camera2_CameraMetadata.cpp
+++ b/
core/jni/android_hardware_camera2_CameraMetadata.cpp
@@
-28,7
+28,7
@@
#include <vector>
#include "jni.h"
-#include
"JNIHelp.h"
+#include
<nativehelper/JNIHelp.h>
#include "android_os_Parcel.h"
#include "core_jni_helpers.h"
#include "android_runtime/android_hardware_camera2_CameraMetadata.h"