Revert "system/gatekeeper: use proper nativehelper headers"
This reverts commit 05b35791c3079543c680efba0789f03cfddafacb.
...
In file included from system/gatekeeper/gatekeeper.cpp:16:
In file included from system/gatekeeper/include/gatekeeper/gatekeeper.h:22:
libnativehelper/include/nativehelper/UniquePtr.h:20:10: fatal error: 'cstdlib' file not found
#include <cstdlib> // For NULL.
Exempt-From-Owner-Approval: build breakage
Change-Id: Ib6e181046504b2559093ce6d92d9d701a527ba01
diff --git a/gatekeeper.cpp b/gatekeeper.cpp
index 76fc8d6..44993cf 100644
--- a/gatekeeper.cpp
+++ b/gatekeeper.cpp
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <UniquePtr.h>
#include <gatekeeper/gatekeeper.h>
-#include <nativehelper/UniquePtr.h>
#include <endian.h>
diff --git a/include/gatekeeper/gatekeeper.h b/include/gatekeeper/gatekeeper.h
index 4615b82..7e1421f 100644
--- a/include/gatekeeper/gatekeeper.h
+++ b/include/gatekeeper/gatekeeper.h
@@ -18,8 +18,8 @@
#define GATEKEEPER_H_
#include <stdint.h>
+#include <UniquePtr.h>
#include <hardware/hw_auth_token.h>
-#include <nativehelper/UniquePtr.h>
#include "gatekeeper_messages.h"
#include "password_handle.h"
diff --git a/include/gatekeeper/gatekeeper_messages.h b/include/gatekeeper/gatekeeper_messages.h
index 305567c..1ec1e18 100644
--- a/include/gatekeeper/gatekeeper_messages.h
+++ b/include/gatekeeper/gatekeeper_messages.h
@@ -17,7 +17,7 @@
#define GATEKEEPER_MESSAGES_H_
#include <stdint.h>
-#include <nativehelper/UniquePtr.h>
+#include <UniquePtr.h>
#include "gatekeeper_utils.h"