diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-29 03:37:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 03:37:18 +0000 |
| commit | 3dea8ac44920d073b83814b466fb053d36562fba (patch) | |
| tree | e524ebe43101f84232fb7fd9d552afbeb89f0654 /nxp | |
| parent | 104ed755a8eea24c3754b768c3e765d6d3865967 (diff) | |
| parent | 9d734bdf2c98e4408d1bf4645a805c24da9c604d (diff) | |
| download | android_packages_apps_Nfc-3dea8ac44920d073b83814b466fb053d36562fba.tar.gz android_packages_apps_Nfc-3dea8ac44920d073b83814b466fb053d36562fba.tar.bz2 android_packages_apps_Nfc-3dea8ac44920d073b83814b466fb053d36562fba.zip | |
am 9d734bdf: Merge "Add missing includes."
* commit '9d734bdf2c98e4408d1bf4645a805c24da9c604d':
Add missing includes.
Diffstat (limited to 'nxp')
| -rw-r--r-- | nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp | 3 | ||||
| -rw-r--r-- | nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp | 3 | ||||
| -rw-r--r-- | nxp/jni/com_android_nfc_NativeNfcTag.cpp | 3 | ||||
| -rw-r--r-- | nxp/jni/com_android_nfc_NativeP2pDevice.cpp | 3 | ||||
| -rw-r--r-- | nxp/jni/com_android_nfc_list.cpp | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp index 74f07642..b1fe791e 100644 --- a/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp +++ b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp @@ -14,8 +14,9 @@ * limitations under the License. */ -#include <semaphore.h> #include <errno.h> +#include <malloc.h> +#include <semaphore.h> #include "com_android_nfc.h" diff --git a/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp index e73df3e0..eeeb9094 100644 --- a/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp +++ b/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp @@ -14,8 +14,9 @@ * limitations under the License. */ -#include <semaphore.h> #include <errno.h> +#include <malloc.h> +#include <semaphore.h> #include <ScopedLocalRef.h> #include "com_android_nfc.h" diff --git a/nxp/jni/com_android_nfc_NativeNfcTag.cpp b/nxp/jni/com_android_nfc_NativeNfcTag.cpp index 3fb98fce..09af46f6 100644 --- a/nxp/jni/com_android_nfc_NativeNfcTag.cpp +++ b/nxp/jni/com_android_nfc_NativeNfcTag.cpp @@ -14,8 +14,9 @@ * limitations under the License. */ -#include <semaphore.h> #include <errno.h> +#include <malloc.h> +#include <semaphore.h> #include <ScopedLocalRef.h> #include <ScopedPrimitiveArray.h> diff --git a/nxp/jni/com_android_nfc_NativeP2pDevice.cpp b/nxp/jni/com_android_nfc_NativeP2pDevice.cpp index 2f4a5b20..f78f6261 100644 --- a/nxp/jni/com_android_nfc_NativeP2pDevice.cpp +++ b/nxp/jni/com_android_nfc_NativeP2pDevice.cpp @@ -15,8 +15,9 @@ * limitations under the License. */ -#include <semaphore.h> #include <errno.h> +#include <malloc.h> +#include <semaphore.h> #include <ScopedLocalRef.h> #include "com_android_nfc.h" diff --git a/nxp/jni/com_android_nfc_list.cpp b/nxp/jni/com_android_nfc_list.cpp index f0487d3c..1d9819f7 100644 --- a/nxp/jni/com_android_nfc_list.cpp +++ b/nxp/jni/com_android_nfc_list.cpp @@ -16,8 +16,9 @@ #include <com_android_nfc_list.h> #include <com_android_nfc.h> -#include <pthread.h> #include <errno.h> +#include <malloc.h> +#include <pthread.h> #include <cutils/log.h> #undef LOG_TAG |