diff options
| author | Steven Moreland | 2017-07-19 10:39:36 -0500 |
|---|---|---|
| committer | android-build-merger | 2017-07-19 10:39:36 -0500 |
| commit | 68c699a0aa2f2fb6f1d1f5e94539be700bb76aaa (patch) | |
| tree | 6a21b36899330f086860058401adf713a770c9c8 /gatekeeperd | |
| parent | 9865760d3df2ff5000a6c00a36ea3fb8da778242 (diff) | |
| parent | 57db1511bdc8f1317997edc1850650f60055ad0c (diff) | |
| download | platform-system-core-68c699a0aa2f2fb6f1d1f5e94539be700bb76aaa.tar.gz platform-system-core-68c699a0aa2f2fb6f1d1f5e94539be700bb76aaa.tar.xz platform-system-core-68c699a0aa2f2fb6f1d1f5e94539be700bb76aaa.zip | |
Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208cd1322 am: 106c355688
am: 57db1511bd
Change-Id: If1de13ecd84a5bf43edefd844e1b46104bddf9a0
Diffstat (limited to 'gatekeeperd')
| -rw-r--r-- | gatekeeperd/SoftGateKeeper.h | 2 | ||||
| -rw-r--r-- | gatekeeperd/SoftGateKeeperDevice.h | 2 | ||||
| -rw-r--r-- | gatekeeperd/tests/gatekeeper_test.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gatekeeperd/SoftGateKeeper.h b/gatekeeperd/SoftGateKeeper.h index cb02a6fc6..92d175290 100644 --- a/gatekeeperd/SoftGateKeeper.h +++ b/gatekeeperd/SoftGateKeeper.h | |||
| @@ -26,8 +26,8 @@ extern "C" { | |||
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | #include <android-base/memory.h> | 28 | #include <android-base/memory.h> |
| 29 | #include <UniquePtr.h> | ||
| 30 | #include <gatekeeper/gatekeeper.h> | 29 | #include <gatekeeper/gatekeeper.h> |
| 30 | #include <nativehelper/UniquePtr.h> | ||
| 31 | 31 | ||
| 32 | #include <iostream> | 32 | #include <iostream> |
| 33 | #include <unordered_map> | 33 | #include <unordered_map> |
diff --git a/gatekeeperd/SoftGateKeeperDevice.h b/gatekeeperd/SoftGateKeeperDevice.h index 3463c29ff..229f9a9e6 100644 --- a/gatekeeperd/SoftGateKeeperDevice.h +++ b/gatekeeperd/SoftGateKeeperDevice.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include "SoftGateKeeper.h" | 20 | #include "SoftGateKeeper.h" |
| 21 | 21 | ||
| 22 | #include <UniquePtr.h> | 22 | #include <nativehelper/UniquePtr.h> |
| 23 | 23 | ||
| 24 | using namespace gatekeeper; | 24 | using namespace gatekeeper; |
| 25 | 25 | ||
diff --git a/gatekeeperd/tests/gatekeeper_test.cpp b/gatekeeperd/tests/gatekeeper_test.cpp index 47a8bfa9d..b3aea7b5d 100644 --- a/gatekeeperd/tests/gatekeeper_test.cpp +++ b/gatekeeperd/tests/gatekeeper_test.cpp | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <gtest/gtest.h> | 20 | #include <gtest/gtest.h> |
| 21 | #include <hardware/hw_auth_token.h> | 21 | #include <hardware/hw_auth_token.h> |
| 22 | #include <UniquePtr.h> | 22 | #include <nativehelper/UniquePtr.h> |
| 23 | 23 | ||
| 24 | #include "../SoftGateKeeper.h" | 24 | #include "../SoftGateKeeper.h" |
| 25 | 25 | ||