summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-03-31 19:14:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-31 19:14:29 +0000
commit4bc08ab9a97159ac3a779101c15530ba2f48a1e4 (patch)
treebeac12fe247e75dccd2c1333925befede493f500 /Android.mk
parentbead5aee1c38e671890b1c28cd1ef9f83b8427e0 (diff)
parent716f20d833537461fef7d5d7ed62157451391f1c (diff)
downloadframeworks_base-4bc08ab9a97159ac3a779101c15530ba2f48a1e4.zip
frameworks_base-4bc08ab9a97159ac3a779101c15530ba2f48a1e4.tar.gz
frameworks_base-4bc08ab9a97159ac3a779101c15530ba2f48a1e4.tar.bz2
am 716f20d8: Merge "Define initial trust agent API"
* commit '716f20d833537461fef7d5d7ed62157451391f1c': Define initial trust agent API
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index d3f2161..194433e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -190,6 +190,8 @@ LOCAL_SRC_FILES += \
core/java/android/service/dreams/IDozeHardware.aidl \
core/java/android/service/dreams/IDreamManager.aidl \
core/java/android/service/dreams/IDreamService.aidl \
+ core/java/android/service/trust/ITrustAgentService.aidl \
+ core/java/android/service/trust/ITrustAgentServiceCallback.aidl \
core/java/android/service/wallpaper/IWallpaperConnection.aidl \
core/java/android/service/wallpaper/IWallpaperEngine.aidl \
core/java/android/service/wallpaper/IWallpaperService.aidl \