diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/Android.mk b/Android.mk index 730eeb111ac7..2a4dd2660127 100644 --- a/Android.mk +++ b/Android.mk @@ -45,6 +45,7 @@ LOCAL_SRC_FILES += \ core/java/android/app/admin/SecurityLogTags.logtags \ core/java/android/content/EventLogTags.logtags \ core/java/android/speech/tts/EventLogTags.logtags \ + core/java/android/net/EventLogTags.logtags \ core/java/android/webkit/EventLogTags.logtags \ core/java/com/android/internal/logging/EventLogTags.logtags \ @@ -117,15 +118,20 @@ LOCAL_SRC_FILES += \ core/java/android/bluetooth/IBluetoothPan.aidl \ core/java/android/bluetooth/IBluetoothManager.aidl \ core/java/android/bluetooth/IBluetoothManagerCallback.aidl \ + core/java/android/bluetooth/IBluetoothMap.aidl \ + core/java/android/bluetooth/IBluetoothMapClient.aidl \ core/java/android/bluetooth/IBluetoothPbap.aidl \ core/java/android/bluetooth/IBluetoothPbapClient.aidl \ - core/java/android/bluetooth/IBluetoothMap.aidl \ core/java/android/bluetooth/IBluetoothSap.aidl \ core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \ core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \ + core/java/android/bluetooth/IBluetoothInputHost.aidl \ + core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ core/java/android/bluetooth/IBluetoothGatt.aidl \ core/java/android/bluetooth/IBluetoothGattCallback.aidl \ core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \ + core/java/android/bluetooth/le/IAdvertiserCallback.aidl \ + core/java/android/bluetooth/le/IScannerCallback.aidl \ core/java/android/content/IClipboard.aidl \ core/java/android/content/IContentService.aidl \ core/java/android/content/IIntentReceiver.aidl \ @@ -206,6 +212,7 @@ LOCAL_SRC_FILES += \ core/java/android/net/INetworkManagementEventObserver.aidl \ core/java/android/net/INetworkPolicyListener.aidl \ core/java/android/net/INetworkPolicyManager.aidl \ + core/java/android/net/INetworkRecommendationProvider.aidl \ core/java/android/net/INetworkScoreCache.aidl \ core/java/android/net/INetworkScoreService.aidl \ core/java/android/net/INetworkStatsService.aidl \ @@ -431,6 +438,8 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl \ telephony/java/com/android/ims/internal/IImsMultiEndpoint.aidl \ telephony/java/com/android/ims/internal/IImsService.aidl \ + telephony/java/com/android/ims/internal/IImsServiceController.aidl \ + telephony/java/com/android/ims/internal/IImsServiceFeatureListener.aidl \ telephony/java/com/android/ims/internal/IImsStreamMediaSession.aidl \ telephony/java/com/android/ims/internal/IImsUt.aidl \ telephony/java/com/android/ims/internal/IImsUtListener.aidl \ @@ -454,9 +463,9 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/IWapPushManager.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ - wifi/java/android/net/wifi/nan/IWifiNanEventListener.aidl \ - wifi/java/android/net/wifi/nan/IWifiNanManager.aidl \ - wifi/java/android/net/wifi/nan/IWifiNanSessionListener.aidl \ + wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.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/IWifiScanner.aidl \ wifi/java/android/net/wifi/IRttManager.aidl \ @@ -474,6 +483,7 @@ LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \ ../../system/netd/server/binder/android/net/INetd.aidl \ + ../native/cmds/installd/binder/android/os/IInstalld.aidl \ LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings @@ -492,13 +502,18 @@ LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/android/Manifest.java \ $(framework_res_source_path)/com/android/internal/R.java +# Make sure that R.java and Manifest.java are built before we build +# the source for this library. +framework_res_R_stamp := \ + $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp +LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp) + LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart core-lambda-stubs conscrypt okhttp core-junit bouncycastle ext +LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext LOCAL_STATIC_JAVA_LIBRARIES := framework-protos LOCAL_MODULE := framework -LOCAL_DX_FLAGS := --core-library --multi-dex LOCAL_JACK_FLAGS := --multi-dex native LOCAL_RMTYPEDEFS := true @@ -508,15 +523,8 @@ LOCAL_EMMA_INSTRUMENT := true endif include $(BUILD_JAVA_LIBRARY) -framework_module := $(LOCAL_INSTALLED_MODULE) - -# Make sure that R.java and Manifest.java are built before we build -# the source for this library. -framework_res_R_stamp := \ - $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp -$(full_classes_compiled_jar): $(framework_res_R_stamp) -$(built_dex_intermediate): $(framework_res_R_stamp) +framework_module := $(LOCAL_INSTALLED_MODULE) $(framework_module): | $(dir $(framework_module))framework-res.apk framework_built := $(call java-lib-deps,framework) @@ -548,11 +556,9 @@ aidl_files := \ frameworks/base/media/java/android/media/tv/TvTrackInfo.aidl \ frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \ frameworks/base/wifi/java/android/net/wifi/ScanSettings.aidl \ - frameworks/base/wifi/java/android/net/wifi/nan/ConfigRequest.aidl \ - frameworks/base/wifi/java/android/net/wifi/nan/PublishData.aidl \ - frameworks/base/wifi/java/android/net/wifi/nan/SubscribeData.aidl \ - frameworks/base/wifi/java/android/net/wifi/nan/PublishSettings.aidl \ - frameworks/base/wifi/java/android/net/wifi/nan/SubscribeSettings.aidl \ + frameworks/base/wifi/java/android/net/wifi/aware/ConfigRequest.aidl \ + frameworks/base/wifi/java/android/net/wifi/aware/PublishConfig.aidl \ + frameworks/base/wifi/java/android/net/wifi/aware/SubscribeConfig.aidl \ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pInfo.aidl \ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.aidl \ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pConfig.aidl \ @@ -733,6 +739,7 @@ packages_to_document := \ # Search through the base framework dirs for these packages. # The result will be relative to frameworks/base. fwbase_dirs_to_document := \ + legacy-test/src \ test-runner/src \ $(patsubst $(LOCAL_PATH)/%,%, \ $(wildcard \ @@ -745,9 +752,6 @@ fwbase_dirs_to_document := \ # include definition of libcore_to_document include libcore/Docs.mk -# include definition of junit_to_document -include external/junit/Common.mk - non_base_dirs := \ ../opt/telephony/src/java/android/provider \ ../opt/telephony/src/java/android/telephony \ @@ -788,8 +792,7 @@ html_dirs := \ # Common sources for doc check and api check common_src_files := \ $(call find-other-html-files, $(html_dirs)) \ - $(addprefix ../../, $(libcore_to_document)) \ - $(addprefix ../../external/junit/, $(junit_to_document)) + $(addprefix ../../, $(libcore_to_document)) # These are relative to frameworks/base framework_docs_LOCAL_SRC_FILES := \ @@ -1116,10 +1119,8 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk include $(BUILD_DROIDDOC) static_doc_index_redirect := $(out_dir)/index.html -$(static_doc_index_redirect): \ - $(LOCAL_PATH)/docs/docs-documentation-redirect.html | $(ACP) - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) $< $@ +$(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-documentation-redirect.html + $(copy-file-to-target) static_doc_properties := $(out_dir)/source.properties $(static_doc_properties): \ @@ -1352,8 +1353,6 @@ 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 |