commit 674673e8489779f7c05a580c7e6c96112b8f8073
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:50:55 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:50:55 2022 +0000
tree f09f14760e7ccfc14047d326269ebafcfcfd5498
parent 786e8b0ba72fc110fa74cce5900689bc6dfc0840
parent dfd56e3d82e4c7ebd7d39a5380429a432ce71a71

Snap for 8730993 from dfd56e3d82e4c7ebd7d39a5380429a432ce71a71 to mainline-tzdata3-release

Change-Id: I5617d34d768c0ddf4f10a1627e9c673c0d29068d

include/gatekeeper/gatekeeper_messages.h

diff --git a/include/gatekeeper/gatekeeper_messages.h b/include/gatekeeper/gatekeeper_messages.h
index 59f419c..ec33f18 100644
--- a/include/gatekeeper/gatekeeper_messages.h
+++ b/include/gatekeeper/gatekeeper_messages.h
@@ -29,8 +29,6 @@
 
 const uint32_t ENROLL = 0;
 const uint32_t VERIFY = 1;
-const uint32_t DELETE_USER = 2;
-const uint32_t DELETE_ALL_USERS = 3;
 
 typedef enum {
     ERROR_NONE = 0,

rules.mk

diff --git a/rules.mk b/rules.mk
index e3daac8..3fff17c 100644
--- a/rules.mk
+++ b/rules.mk
@@ -6,15 +6,14 @@
 	$(LOCAL_DIR)/gatekeeper_messages.cpp \
 	$(LOCAL_DIR)/gatekeeper.cpp
 
-MODULE_EXPORT_INCLUDES += $(LOCAL_DIR)/include/
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include/
 
 MODULE_CPPFLAGS := -std=c++11 -Werror -Wunused-parameter
 
 MODULE_INCLUDES := \
 	$(LOCAL_DIR)/../../hardware/libhardware/include
 
-MODULE_LIBRARY_DEPS := \
+MODULE_DEPS := \
 	trusty/user/base/lib/libc-trusty \
-	trusty/user/base/lib/libstdc++-trusty \
 
-include make/library.mk
+include make/module.mk