diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 84 |
1 files changed, 76 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 0d19ae0c51ab..1ed8a2506600 100644 --- a/Android.mk +++ b/Android.mk @@ -270,6 +270,9 @@ 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/IStatsCallbacks.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 +307,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 \ @@ -376,7 +380,7 @@ LOCAL_SRC_FILES += \ core/java/android/speech/tts/ITextToSpeechService.aidl \ core/java/com/android/internal/app/IAppOpsCallback.aidl \ core/java/com/android/internal/app/IAppOpsService.aidl \ - core/java/com/android/internal/app/IAssistScreenshotReceiver.aidl \ + core/java/com/android/internal/app/IAssistDataReceiver.aidl \ core/java/com/android/internal/app/IBatteryStats.aidl \ core/java/com/android/internal/app/ISoundTriggerService.aidl \ core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \ @@ -422,7 +426,6 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl \ core/java/com/android/internal/widget/ILockSettings.aidl \ core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \ - core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \ keystore/java/android/security/IKeyChainAliasCallback.aidl \ keystore/java/android/security/IKeyChainService.aidl \ location/java/android/location/IBatchedLocationCallback.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 \ @@ -545,10 +548,13 @@ LOCAL_SRC_FILES += \ 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/IWifiAwareDiscoverySessionCallback.aidl \ wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl \ + wifi/java/android/net/wifi/aware/IWifiAwareMacAddressProvider.aidl \ wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl \ - wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl \ wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \ + wifi/java/android/net/wifi/rtt/IRttCallback.aidl \ + wifi/java/android/net/wifi/rtt/IWifiRttManager.aidl \ wifi/java/android/net/wifi/IWifiScanner.aidl \ wifi/java/android/net/wifi/IRttManager.aidl \ packages/services/PacProcessor/com/android/net/IProxyService.aidl \ @@ -564,11 +570,17 @@ LOCAL_SRC_FILES += \ ../../system/update_engine/binder_bindings/android/os/IUpdateEngineCallback.aidl \ LOCAL_SRC_FILES += \ + ../../system/core/storaged/binder/android/os/IStoraged.aidl \ ../../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 +LOCAL_AIDL_INCLUDES += core/java/android/os/StatsLogEventWrapper.aidl + LOCAL_AIDL_INCLUDES += frameworks/base/lowpan/java LOCAL_SRC_FILES += \ lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl \ @@ -578,6 +590,17 @@ LOCAL_SRC_FILES += \ lowpan/java/android/net/lowpan/ILowpanManagerListener.aidl \ lowpan/java/android/net/lowpan/ILowpanManager.aidl +# StatsLog generated functions +statslog_src_dir := $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)/statslog +gen := $(statslog_src_dir)/android/util/StatsLog.java +$(gen): PRIVATE_PATH := $(LOCAL_PATH) +$(gen): PRIVATE_CUSTOM_TOOL = $(HOST_OUT_EXECUTABLES)/stats-log-api-gen --java $@ +$(gen): $(HOST_OUT_EXECUTABLES)/stats-log-api-gen + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(gen) +statslog_src_dir:= +gen:= + # FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk LOCAL_AIDL_INCLUDES += \ $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \ @@ -586,8 +609,11 @@ 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/core/storaged/binder \ system/netd/server/binder \ + system/vold/binder \ system/bt/binder LOCAL_INTERMEDIATE_SOURCES := \ @@ -604,8 +630,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext -LOCAL_STATIC_JAVA_LIBRARIES := \ - framework-protos \ +LOCAL_STATIC_JAVA_LIBRARIES := \ + framework-protos \ + android.hidl.base-V1.0-java \ + android.hardware.cas-V1.0-java \ android.hardware.health-V1.0-java-constants \ android.hardware.thermal-V1.0-java-constants \ android.hardware.tv.input-V1.0-java-constants \ @@ -615,8 +643,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android.hardware.vibrator-V1.1-java-constants \ android.hardware.wifi-V1.0-java-constants \ -include hardware/interfaces/cas/1.0/CasHal.mk - # Loaded with System.loadLibrary by android.view.textclassifier LOCAL_REQUIRED_MODULES += libtextclassifier @@ -689,6 +715,8 @@ aidl_files := \ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pGroup.aidl \ frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl \ frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl \ + frameworks/base/wifi/java/android/net/wifi/rtt/RangingRequest.aidl \ + frameworks/base/wifi/java/android/net/wifi/rtt/RangingResult.aidl \ frameworks/base/wifi/java/android/net/wifi/WpsInfo.aidl \ frameworks/base/wifi/java/android/net/wifi/ScanResult.aidl \ frameworks/base/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.aidl \ @@ -1077,6 +1105,31 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -federate SupportLib https://developer.android.com \ -federationapi SupportLib prebuilts/sdk/current/support-api.txt +# ==== the api diff =========================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(framework_docs_LOCAL_API_CHECK_SRC_FILES) +LOCAL_INTERMEDIATE_SOURCES := $(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_JAVA_LIBRARIES := $(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) +LOCAL_MODULE_CLASS := $(framework_docs_LOCAL_MODULE_CLASS) +LOCAL_ADDITIONAL_JAVA_DIR := $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) +LOCAL_ADDITIONAL_DEPENDENCIES := \ + $(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) \ + $(INTERNAL_PLATFORM_API_FILE) + +LOCAL_MODULE := offline-sdk-referenceonly + +last_released_sdk_version := $(lastword $(call numerically_sort, \ + $(filter-out current, \ + $(patsubst $(SRC_API_DIR)/%.txt,%, $(wildcard $(SRC_API_DIR)/*.txt)) \ + )\ + )) + +LOCAL_APIDIFF_OLDAPI := $(LOCAL_PATH)/../../$(SRC_API_DIR)/$(last_released_sdk_version) +LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_API_FILE)) + +include $(BUILD_APIDIFF) + # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) @@ -1500,10 +1553,25 @@ LOCAL_PROTOC_FLAGS := \ -Iexternal/protobuf/src LOCAL_SOURCE_FILES_ALL_GENERATED := true LOCAL_SRC_FILES := \ + tools/streaming_proto/stream.proto \ $(call all-proto-files-under, core/proto) \ $(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 # ============================================================ |