summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk83
1 files changed, 53 insertions, 30 deletions
diff --git a/Android.mk b/Android.mk
index 3f2ae83294a0..55ea69a7b437 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 \
@@ -157,6 +159,7 @@ LOCAL_SRC_FILES += \
core/java/android/content/ISyncServiceAdapter.aidl \
core/java/android/content/ISyncStatusObserver.aidl \
core/java/android/content/om/IOverlayManager.aidl \
+ core/java/android/content/pm/IDexModuleRegisterCallback.aidl \
core/java/android/content/pm/ILauncherApps.aidl \
core/java/android/content/pm/IOnAppsChangedListener.aidl \
core/java/android/content/pm/IOnPermissionsChangeListener.aidl \
@@ -215,6 +218,9 @@ LOCAL_SRC_FILES += \
core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \
core/java/android/hardware/location/IContextHubCallback.aidl \
core/java/android/hardware/location/IContextHubService.aidl \
+ core/java/android/hardware/radio/IRadioService.aidl \
+ core/java/android/hardware/radio/ITuner.aidl \
+ core/java/android/hardware/radio/ITunerCallback.aidl \
core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl \
core/java/android/hardware/usb/IUsbManager.aidl \
core/java/android/net/ICaptivePortal.aidl \
@@ -277,6 +283,18 @@ LOCAL_SRC_FILES += \
core/java/android/service/carrier/ICarrierService.aidl \
core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
core/java/android/service/carrier/ICarrierMessagingService.aidl \
+ core/java/android/service/euicc/IDeleteSubscriptionCallback.aidl \
+ core/java/android/service/euicc/IDownloadSubscriptionCallback.aidl \
+ core/java/android/service/euicc/IEraseSubscriptionsCallback.aidl \
+ core/java/android/service/euicc/IEuiccService.aidl \
+ core/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl \
+ core/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl \
+ core/java/android/service/euicc/IGetEidCallback.aidl \
+ core/java/android/service/euicc/IGetEuiccInfoCallback.aidl \
+ core/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl \
+ core/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl \
+ core/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl \
+ core/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl \
core/java/android/service/gatekeeper/IGateKeeperService.aidl \
core/java/android/service/notification/INotificationListener.aidl \
core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
@@ -340,6 +358,7 @@ LOCAL_SRC_FILES += \
core/java/android/view/IPinnedStackController.aidl \
core/java/android/view/IPinnedStackListener.aidl \
core/java/android/view/IRotationWatcher.aidl \
+ core/java/android/view/IWallpaperVisibilityListener.aidl \
core/java/android/view/IWindow.aidl \
core/java/android/view/IWindowFocusObserver.aidl \
core/java/android/view/IWindowId.aidl \
@@ -368,6 +387,7 @@ LOCAL_SRC_FILES += \
core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \
core/java/com/android/internal/backup/IBackupTransport.aidl \
core/java/com/android/internal/backup/IObbBackupService.aidl \
+ core/java/com/android/internal/car/ICarServiceHelper.aidl \
core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl \
core/java/com/android/internal/policy/IKeyguardDrawnCallback.aidl \
core/java/com/android/internal/policy/IKeyguardDismissCallback.aidl \
@@ -482,6 +502,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 +532,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 \
@@ -516,6 +543,7 @@ LOCAL_SRC_FILES += \
telephony/java/com/android/internal/telephony/ITelephony.aidl \
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
+ telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl \
wifi/java/android/net/wifi/IWifiManager.aidl \
wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl \
wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl \
@@ -541,6 +569,15 @@ LOCAL_SRC_FILES += \
LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings
+LOCAL_AIDL_INCLUDES += frameworks/base/lowpan/java
+LOCAL_SRC_FILES += \
+ lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl \
+ lowpan/java/android/net/lowpan/ILowpanNetScanCallback.aidl \
+ lowpan/java/android/net/lowpan/ILowpanInterfaceListener.aidl \
+ lowpan/java/android/net/lowpan/ILowpanInterface.aidl \
+ lowpan/java/android/net/lowpan/ILowpanManagerListener.aidl \
+ lowpan/java/android/net/lowpan/ILowpanManager.aidl
+
# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
LOCAL_AIDL_INCLUDES += \
$(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \
@@ -572,7 +609,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android.hardware.thermal-V1.0-java-constants \
android.hardware.tv.input-V1.0-java-constants \
android.hardware.usb-V1.0-java-constants \
+ android.hardware.usb-V1.1-java-constants \
android.hardware.vibrator-V1.0-java-constants \
+ android.hardware.vibrator-V1.1-java-constants \
+ android.hardware.wifi-V1.0-java-constants \
# Loaded with System.loadLibrary by android.view.textclassifier
LOCAL_REQUIRED_MODULES += libtextclassifier
@@ -605,6 +645,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 \
@@ -612,6 +658,9 @@ aidl_files := \
frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \
frameworks/base/telephony/java/android/telephony/ModemActivityInfo.aidl \
+ frameworks/base/telephony/java/android/telephony/UiccAccessRule.aidl \
+ frameworks/base/telephony/java/android/telephony/euicc/DownloadableSubscription.aidl \
+ frameworks/base/telephony/java/android/telephony/euicc/EuiccInfo.aidl \
frameworks/base/location/java/android/location/Location.aidl \
frameworks/base/location/java/android/location/Address.aidl \
frameworks/base/location/java/android/location/Criteria.aidl \
@@ -665,6 +714,7 @@ aidl_files := \
frameworks/base/core/java/android/print/PrinterInfo.aidl \
frameworks/base/core/java/android/print/PrintJobId.aidl \
frameworks/base/core/java/android/printservice/recommendation/RecommendationInfo.aidl \
+ frameworks/base/core/java/android/hardware/radio/RadioManager.aidl \
frameworks/base/core/java/android/hardware/usb/UsbDevice.aidl \
frameworks/base/core/java/android/hardware/usb/UsbInterface.aidl \
frameworks/base/core/java/android/hardware/usb/UsbEndpoint.aidl \
@@ -724,6 +774,9 @@ aidl_files := \
frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
frameworks/base/core/java/android/service/carrier/CarrierIdentifier.aidl \
frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
+ frameworks/base/core/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.aidl \
+ frameworks/base/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.aidl \
+ frameworks/base/core/java/android/service/euicc/GetEuiccProfileInfoListResult.aidl \
frameworks/base/core/java/android/service/notification/Adjustment.aidl \
frameworks/base/core/java/android/service/notification/Condition.aidl \
frameworks/base/core/java/android/service/notification/SnoozeCriterion.aidl \
@@ -834,7 +887,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 +1502,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