diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-19 16:45:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-19 16:45:23 +0000 |
| commit | aa2bd8d0d94ad7e740de00db81033968b8bd8fd0 (patch) | |
| tree | 041c41ce314d8b2b5d34c4d05550cd5edb214373 | |
| parent | 6647e95a1a0517d666e9832ad68f6db73b1a6349 (diff) | |
| parent | 9e2893e34f16786b0264efe467f61f1b9831db2a (diff) | |
| download | gatekeeper-aa2bd8d0d94ad7e740de00db81033968b8bd8fd0.tar.gz | |
Revert "system/gatekeeper: use proper nativehelper headers" am: da7470b6d2 am: 0cbbed65b2
am: 9e2893e34f
Change-Id: Ie23f52a146254baf7670aa4dc59ca4a8f5e61657
| -rw-r--r-- | gatekeeper.cpp | 2 | ||||
| -rw-r--r-- | include/gatekeeper/gatekeeper.h | 2 | ||||
| -rw-r--r-- | include/gatekeeper/gatekeeper_messages.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gatekeeper.cpp b/gatekeeper.cpp index f9024d3..cfd878f 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" |