diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/Android.mk b/Android.mk index 3f2ae83294a0..7137cd8ed53d 100644 --- a/Android.mk +++ b/Android.mk @@ -114,6 +114,8 @@ LOCAL_SRC_FILES += \ core/java/android/app/backup/IRestoreObserver.aidl \ core/java/android/app/backup/IRestoreSession.aidl \ core/java/android/app/backup/ISelectBackupTransportCallback.aidl \ + core/java/android/app/timezone/ICallback.aidl \ + core/java/android/app/timezone/IRulesManager.aidl \ core/java/android/app/usage/ICacheQuotaService.aidl \ core/java/android/app/usage/IStorageStatsManager.aidl \ core/java/android/app/usage/IUsageStatsManager.aidl \ @@ -482,6 +484,12 @@ 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/IDownloadCallback.aidl \ + telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \ + telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \ + telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \ telephony/java/com/android/ims/internal/IImsCallSession.aidl \ telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl \ telephony/java/com/android/ims/internal/IImsConfig.aidl \ @@ -506,6 +514,7 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl \ telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl \ telephony/java/com/android/ims/ImsConfigListener.aidl \ + telephony/java/com/android/internal/telephony/IApnSourceService.aidl \ telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl \ telephony/java/com/android/internal/telephony/IMms.aidl \ telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \ @@ -605,6 +614,12 @@ framework_built := $(call java-lib-deps,framework) include $(CLEAR_VARS) aidl_files := \ + frameworks/base/telephony/java/android/telephony/mbms/DownloadRequest.aidl \ + frameworks/base/telephony/java/android/telephony/mbms/DownloadStatus.aidl \ + frameworks/base/telephony/java/android/telephony/mbms/FileInfo.aidl \ + frameworks/base/telephony/java/android/telephony/mbms/FileServiceInfo.aidl \ + frameworks/base/telephony/java/android/telephony/mbms/ServiceInfo.aidl \ + frameworks/base/telephony/java/android/telephony/mbms/StreamingServiceInfo.aidl \ frameworks/base/telephony/java/android/telephony/ServiceState.aidl \ frameworks/base/telephony/java/android/telephony/SubscriptionInfo.aidl \ frameworks/base/telephony/java/android/telephony/CellInfo.aidl \ @@ -834,7 +849,6 @@ fwbase_dirs_to_document := \ include libcore/Docs.mk non_base_dirs := \ - ../opt/telephony/src/java/android/provider \ ../opt/telephony/src/java/android/telephony \ ../opt/telephony/src/java/android/telephony/gsm \ ../opt/net/voip/src/java/android/net/rtp \ @@ -1450,35 +1464,6 @@ endif include $(BUILD_JAVA_LIBRARY) -# ==== c++ proto device library ============================== -include $(CLEAR_VARS) -LOCAL_MODULE := libplatformprotos -# b/34740546, work around clang-tidy segmentation fault. -LOCAL_TIDY_CHECKS := -modernize* -LOCAL_PROTOC_OPTIMIZE_TYPE := lite -LOCAL_PROTOC_FLAGS := \ - --include_source_info \ - -Iexternal/protobuf/src -LOCAL_SRC_FILES := \ - $(call all-proto-files-under, core/proto) \ - $(call all-proto-files-under, libs/incident/proto) -include $(BUILD_STATIC_LIBRARY) - -# ==== c++ proto host library ============================== -include $(CLEAR_VARS) -LOCAL_MODULE := libplatformprotos -# b/34740546, work around clang-tidy segmentation fault. -LOCAL_TIDY_CHECKS := -modernize* -LOCAL_PROTOC_OPTIMIZE_TYPE := full -LOCAL_PROTOC_FLAGS := \ - --include_source_info \ - -Iexternal/protobuf/src -LOCAL_SRC_FILES := \ - $(call all-proto-files-under, core/proto) \ - $(call all-proto-files-under, libs/incident/proto) -include $(BUILD_HOST_SHARED_LIBRARY) - - # ==== java proto host library ============================== include $(CLEAR_VARS) LOCAL_MODULE := platformprotos |