summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-03-31 19:25:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-31 19:25:58 +0000
commit3830700257028d26506f4a9bd5a3dd25798d675f (patch)
treec2c35376135ca53fc377f565e7bbfd2cc3eef1e3 /Android.mk
parent235551d07dda0f3cc13e0e2f1e1d99b2bc734e0c (diff)
parent53ab5174d5009786dc58da3011181b77e325c130 (diff)
downloadframeworks_base-3830700257028d26506f4a9bd5a3dd25798d675f.zip
frameworks_base-3830700257028d26506f4a9bd5a3dd25798d675f.tar.gz
frameworks_base-3830700257028d26506f4a9bd5a3dd25798d675f.tar.bz2
am 53ab5174: Merge "Define trust agent framework components"
* commit '53ab5174d5009786dc58da3011181b77e325c130': Define trust agent framework components
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 194433e..798df3d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -85,6 +85,8 @@ LOCAL_SRC_FILES += \
core/java/android/app/IWallpaperManager.aidl \
core/java/android/app/IWallpaperManagerCallback.aidl \
core/java/android/app/admin/IDevicePolicyManager.aidl \
+ core/java/android/app/trust/ITrustManager.aidl \
+ core/java/android/app/trust/ITrustListener.aidl \
core/java/android/app/backup/IBackupManager.aidl \
core/java/android/app/backup/IFullBackupRestoreObserver.aidl \
core/java/android/app/backup/IRestoreObserver.aidl \