commit dd0ab1f0559599b6789a2772c6315ca0e6458f01
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed Jul 08 00:14:06 2020 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Wed Jul 08 00:14:06 2020 +0000
tree 451d6a029b256e3a57f71c0e982a64bacbefdd18
parent 329f3b902abad6371667f1e3435ebe83db4a77d8
parent d84348de3143156d92f1c46a017a82df08207597

Snap for 6660490 from d84348de3143156d92f1c46a017a82df08207597 to sdk-release

Change-Id: Idd896522aa37c8a5814e26ea2a6de974b09e0c23

Makefile

diff --git a/Makefile b/Makefile
index fdb11ac..6b4aa54 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,6 @@
 GTEST=$(BASE)/external/googletest/googletest
 
 INCLUDES=$(foreach dir,$(SUBS),-I $(BASE)/$(dir)/include) \
-	-I $(BASE)/libnativehelper/include/nativehelper \
 	-I $(GTEST)/include -isystem $(GTEST) -Iinclude -I$(BASE)/../boringssl/include
 
 ifdef FORCE_32_BIT

include/keymaster/android_keymaster_messages.h

diff --git a/include/keymaster/android_keymaster_messages.h b/include/keymaster/android_keymaster_messages.h
index 95219bc..4dbabd7 100644
--- a/include/keymaster/android_keymaster_messages.h
+++ b/include/keymaster/android_keymaster_messages.h
@@ -56,6 +56,7 @@
     DESTROY_ATTESTATION_IDS = 24,
     IMPORT_WRAPPED_KEY = 25,
     EARLY_BOOT_ENDED = 26,
+    DEVICE_LOCKED = 27,
 };
 
 /**