diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 33936f361c24..aa7caa547e43 100644 --- a/Android.mk +++ b/Android.mk @@ -270,6 +270,8 @@ LOCAL_SRC_FILES += \ core/java/android/os/IRecoverySystemProgressListener.aidl \ core/java/android/os/IRemoteCallback.aidl \ core/java/android/os/ISchedulingPolicyService.aidl \ + core/java/android/os/IStatsCompanionService.aidl \ + core/java/android/os/IStatsManager.aidl \ core/java/android/os/IThermalEventListener.aidl \ core/java/android/os/IThermalService.aidl \ core/java/android/os/IUpdateLock.aidl \ @@ -304,6 +306,7 @@ LOCAL_SRC_FILES += \ core/java/android/service/notification/IStatusBarNotificationHolder.aidl \ core/java/android/service/notification/IConditionListener.aidl \ core/java/android/service/notification/IConditionProvider.aidl \ + core/java/android/service/settings/suggestions/ISuggestionService.aidl \ core/java/android/service/vr/IPersistentVrStateCallbacks.aidl \ core/java/android/service/vr/IVrListener.aidl \ core/java/android/service/vr/IVrManager.aidl \ @@ -452,7 +455,7 @@ LOCAL_SRC_FILES += \ media/java/android/media/IMediaScannerListener.aidl \ media/java/android/media/IMediaScannerService.aidl \ media/java/android/media/IPlaybackConfigDispatcher.aidl \ - media/java/android/media/IPlayer.aidl \ + ../av/media/libaudioclient/aidl/android/media/IPlayer.aidl \ media/java/android/media/IRecordingConfigDispatcher.aidl \ media/java/android/media/IRemoteDisplayCallback.aidl \ media/java/android/media/IRemoteDisplayProvider.aidl \ @@ -502,9 +505,9 @@ LOCAL_SRC_FILES += \ telecomm/java/com/android/internal/telecom/IInCallService.aidl \ telecomm/java/com/android/internal/telecom/ITelecomService.aidl \ telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \ - telephony/java/android/telephony/mbms/IMbmsDownloadManagerCallback.aidl \ - telephony/java/android/telephony/mbms/IMbmsStreamingManagerCallback.aidl \ - telephony/java/android/telephony/mbms/IDownloadProgressListener.aidl \ + telephony/java/android/telephony/mbms/IMbmsDownloadSessionCallback.aidl \ + telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl \ + telephony/java/android/telephony/mbms/IDownloadStateCallback.aidl \ telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \ telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \ telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \ @@ -565,6 +568,9 @@ LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \ ../../system/netd/server/binder/android/net/INetd.aidl \ + ../../system/vold/binder/android/os/IVold.aidl \ + ../../system/vold/binder/android/os/IVoldListener.aidl \ + ../../system/vold/binder/android/os/IVoldTaskListener.aidl \ ../native/cmds/installd/binder/android/os/IInstalld.aidl \ LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings @@ -586,8 +592,10 @@ LOCAL_AIDL_INCLUDES += \ LOCAL_AIDL_INCLUDES += \ frameworks/av/camera/aidl \ frameworks/av/drm/libmediadrm/aidl \ + frameworks/av/media/libaudioclient/aidl \ frameworks/native/aidl/gui \ system/netd/server/binder \ + system/vold/binder \ system/bt/binder LOCAL_INTERMEDIATE_SOURCES := \ @@ -1580,6 +1588,20 @@ LOCAL_SRC_FILES := \ $(call all-proto-files-under, libs/incident/proto) include $(BUILD_HOST_JAVA_LIBRARY) +# ==== java proto device library (for test only) ============================== +include $(CLEAR_VARS) +LOCAL_MODULE := platformprotosnano +LOCAL_MODULE_TAGS := tests optional +LOCAL_PROTOC_OPTIMIZE_TYPE := nano +LOCAL_PROTOC_FLAGS := \ + -Iexternal/protobuf/src +LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \ + store_unknown_fields = true +LOCAL_JAVA_LIBRARIES := core-oj core-libart +LOCAL_SRC_FILES := \ + $(call all-proto-files-under, core/proto) +include $(BUILD_STATIC_JAVA_LIBRARY) + # Include subdirectory makefiles # ============================================================ |