diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 93 |
1 files changed, 31 insertions, 62 deletions
diff --git a/Android.mk b/Android.mk index aa7caa547e43..9843f175bf2d 100644 --- a/Android.mk +++ b/Android.mk @@ -128,7 +128,7 @@ LOCAL_SRC_FILES += \ ../../system/bt/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothHealth.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothHealthCallback.aidl \ - ../../system/bt/binder/android/bluetooth/IBluetoothInputDevice.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHidHost.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothPan.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothManager.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothManagerCallback.aidl \ @@ -139,7 +139,7 @@ LOCAL_SRC_FILES += \ ../../system/bt/binder/android/bluetooth/IBluetoothSap.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothStateChangeCallback.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothHeadsetClient.aidl \ - ../../system/bt/binder/android/bluetooth/IBluetoothInputHost.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHidDevice.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothGatt.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothGattCallback.aidl \ @@ -270,6 +270,7 @@ 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 \ @@ -379,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 \ @@ -425,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 \ @@ -548,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 \ @@ -567,6 +570,7 @@ 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 \ @@ -575,6 +579,8 @@ LOCAL_SRC_FILES += \ 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 \ @@ -584,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) \ @@ -594,6 +611,7 @@ LOCAL_AIDL_INCLUDES += \ 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 @@ -634,6 +652,8 @@ LOCAL_PROTOC_FLAGS := \ LOCAL_MODULE := framework +LOCAL_JAVAC_SHARD_SIZE := 150 + LOCAL_DX_FLAGS := --core-library --multi-dex LOCAL_JACK_FLAGS := --multi-dex native @@ -650,32 +670,6 @@ $(framework_module): | $(dir $(framework_module))framework-res.apk framework_built := $(call java-lib-deps,framework) -# HwBinder -# ======================================================= -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - core/java/android/os/HidlSupport.java \ - core/java/android/annotation/NonNull.java \ - core/java/android/os/HwBinder.java \ - core/java/android/os/HwBlob.java \ - core/java/android/os/HwParcel.java \ - core/java/android/os/IHwBinder.java \ - core/java/android/os/IHwInterface.java \ - core/java/android/os/DeadObjectException.java \ - core/java/android/os/DeadSystemException.java \ - core/java/android/os/RemoteException.java \ - core/java/android/util/AndroidException.java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := hwbinder - -LOCAL_DX_FLAGS := --core-library -LOCAL_UNINSTALLABLE_MODULE := true -include $(BUILD_JAVA_LIBRARY) - # Copy AIDL files to be preprocessed and included in the SDK, # specified relative to the root of the build tree. # ============================================================ @@ -721,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 \ @@ -993,7 +989,8 @@ framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/android/R.java \ $(framework_res_source_path)/android/Manifest.java \ - $(framework_res_source_path)/com/android/internal/R.java + $(framework_res_source_path)/com/android/internal/R.java \ + $(patsubst $(TARGET_OUT_COMMON_INTERMEDIATES)/%,%,$(libcore_to_document_generated)) framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ core-oj \ @@ -1052,6 +1049,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/24.txt 24 \ -since $(SRC_API_DIR)/25.txt 25 \ -since $(SRC_API_DIR)/26.txt 26 \ + -since $(SRC_API_DIR)/27.txt 27 \ -werror -lerror -hide 111 -hide 113 -hide 121 -hide 125 -hide 126 -hide 127 -hide 128 \ -overview $(LOCAL_PATH)/core/java/overview.html \ @@ -1063,7 +1061,7 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \ framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \ frameworks/base/docs/knowntags.txt \ - libcore/Docs.mk + $(libcore_to_document_generated) samples_dir := development/samples/browseable @@ -1547,35 +1545,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk include $(BUILD_DROIDDOC) -# Build ext.jar -# ============================================================ - -ext_dirs := \ - ../../external/nist-sip/java \ - ../../external/tagsoup/src \ - -ext_src_files := $(call all-java-files-under,$(ext_dirs)) - -# ==== the library ========================================= -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(ext_src_files) - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := ext - -LOCAL_DX_FLAGS := --core-library - -ifneq ($(INCREMENTAL_BUILDS),) - LOCAL_PROGUARD_ENABLED := disabled - LOCAL_JACK_ENABLED := incremental -endif - -include $(BUILD_JAVA_LIBRARY) - # ==== java proto host library ============================== include $(CLEAR_VARS) LOCAL_MODULE := platformprotos |