diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-05-20 20:44:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-20 20:44:28 +0000 |
| commit | f082bb2a7f6ad064bbd608d079851c9df18ef0f4 (patch) | |
| tree | bf10c010fae2f28835233f99479999c39a8b34ec /Android.mk | |
| parent | 084110bd394b72b42451a266f7e4c5b1348b86de (diff) | |
| parent | 6664aee15ae2f1183d5c6820bb47c6d7d55806c0 (diff) | |
| download | frameworks_base-f082bb2a7f6ad064bbd608d079851c9df18ef0f4.zip frameworks_base-f082bb2a7f6ad064bbd608d079851c9df18ef0f4.tar.gz frameworks_base-f082bb2a7f6ad064bbd608d079851c9df18ef0f4.tar.bz2 | |
Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -146,6 +146,7 @@ LOCAL_SRC_FILES += \ core/java/android/database/IContentObserver.aidl \ core/java/android/hardware/ICameraService.aidl \ core/java/android/hardware/ICameraServiceListener.aidl \ + core/java/android/hardware/ICameraServiceProxy.aidl \ core/java/android/hardware/ICamera.aidl \ core/java/android/hardware/ICameraClient.aidl \ core/java/android/hardware/IConsumerIrService.aidl \ |