From 4846b9048bc711dc77ec7ead69e76273fed008e5 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Fri, 16 Feb 2018 12:04:48 -0800
Subject: [PATCH] Camera NDK: fix headers

- Include stdbool.h for using bool in C
- Add typedef to restore backward compatibility

Bug: https://github.com/android-ndk/ndk/issues/559
Change-Id: I28f5a99ea6271e364a2d1db793dbadcc63fe2f2c
---
 camera/ndk/include/camera/NdkCameraCaptureSession.h | 1 +
 camera/ndk/include/camera/NdkCameraDevice.h         | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/camera/ndk/include/camera/NdkCameraCaptureSession.h b/camera/ndk/include/camera/NdkCameraCaptureSession.h
index d96f5386b7..16d227af64 100644
--- a/camera/ndk/include/camera/NdkCameraCaptureSession.h
+++ b/camera/ndk/include/camera/NdkCameraCaptureSession.h
@@ -33,6 +33,7 @@
  * Do not #include files that aren't part of the NDK.
  */
 #include <sys/cdefs.h>
+#include <stdbool.h>
 
 #include <android/native_window.h>
 #include "NdkCameraError.h"
diff --git a/camera/ndk/include/camera/NdkCameraDevice.h b/camera/ndk/include/camera/NdkCameraDevice.h
index 6c9e85a829..2c65529b4b 100644
--- a/camera/ndk/include/camera/NdkCameraDevice.h
+++ b/camera/ndk/include/camera/NdkCameraDevice.h
@@ -152,6 +152,11 @@ typedef struct ACameraDevice_StateCallbacks {
     ACameraDevice_ErrorStateCallback  onError;
 } ACameraDevice_StateCallbacks;
 
+/**
+ * For backward compatiblity.
+ */
+typedef ACameraDevice_StateCallbacks ACameraDevice_stateCallbacks;
+
 /**
  * Close the connection and free this ACameraDevice synchronously. Access to the ACameraDevice
  * after calling this method will cause a crash.