diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/Android.mk b/Android.mk index 810c0600c3ec..5f3327c8cbff 100644 --- a/Android.mk +++ b/Android.mk @@ -47,18 +47,6 @@ LOCAL_SRC_FILES := $(filter-out \ org/mobilecontrol/% \ ,$(LOCAL_SRC_FILES)) -# Include a different set of source files when building a debug build. -# TODO: Maybe build these into a separate .jar and put it on the classpath -# in front of framework.jar. -# NOTE: Do not use this as an example; this is a very special situation. -# Do not modify LOCAL_SRC_FILES based on any variable other -# than TARGET_BUILD_TYPE, otherwise builds can become inconsistent. -ifeq ($(TARGET_BUILD_TYPE),debug) - LOCAL_SRC_FILES += $(call find-other-java-files,core/config/debug) -else - LOCAL_SRC_FILES += $(call find-other-java-files,core/config/ndebug) -endif - ## READ ME: ######################################################## ## ## When updating this list of aidl files, consider if that aidl is @@ -83,22 +71,26 @@ LOCAL_SRC_FILES += \ core/java/android/app/IBackupAgent.aidl \ core/java/android/app/IInstrumentationWatcher.aidl \ core/java/android/app/INotificationManager.aidl \ + core/java/android/app/IProcessObserver.aidl \ core/java/android/app/ISearchManager.aidl \ core/java/android/app/ISearchManagerCallback.aidl \ core/java/android/app/IServiceConnection.aidl \ core/java/android/app/IThumbnailReceiver.aidl \ + core/java/android/app/IThumbnailRetriever.aidl \ core/java/android/app/ITransientNotification.aidl \ core/java/android/app/IUiModeManager.aidl \ core/java/android/app/IWallpaperManager.aidl \ core/java/android/app/IWallpaperManagerCallback.aidl \ core/java/android/app/admin/IDevicePolicyManager.aidl \ core/java/android/app/backup/IBackupManager.aidl \ + core/java/android/app/backup/IFullBackupRestoreObserver.aidl \ core/java/android/app/backup/IRestoreObserver.aidl \ core/java/android/app/backup/IRestoreSession.aidl \ core/java/android/bluetooth/IBluetooth.aidl \ core/java/android/bluetooth/IBluetoothA2dp.aidl \ core/java/android/bluetooth/IBluetoothCallback.aidl \ core/java/android/bluetooth/IBluetoothHeadset.aidl \ + core/java/android/bluetooth/IBluetoothHealthCallback.aidl \ core/java/android/bluetooth/IBluetoothPbap.aidl \ core/java/android/content/IClipboard.aidl \ core/java/android/content/IContentService.aidl \ @@ -119,9 +111,13 @@ LOCAL_SRC_FILES += \ core/java/android/net/IConnectivityManager.aidl \ core/java/android/net/INetworkManagementEventObserver.aidl \ core/java/android/net/IThrottleManager.aidl \ + core/java/android/net/INetworkPolicyListener.aidl \ + core/java/android/net/INetworkPolicyManager.aidl \ + core/java/android/net/INetworkStatsService.aidl \ core/java/android/nfc/ILlcpConnectionlessSocket.aidl \ core/java/android/nfc/ILlcpServiceSocket.aidl \ core/java/android/nfc/ILlcpSocket.aidl \ + core/java/android/nfc/INdefPushCallback.aidl \ core/java/android/nfc/INfcAdapter.aidl \ core/java/android/nfc/INfcAdapterExtras.aidl \ core/java/android/nfc/INfcTag.aidl \ @@ -130,14 +126,15 @@ LOCAL_SRC_FILES += \ core/java/android/os/IHardwareService.aidl \ core/java/android/os/IMessenger.aidl \ core/java/android/os/INetworkManagementService.aidl \ - core/java/android/os/INetStatService.aidl \ core/java/android/os/IPermissionController.aidl \ core/java/android/os/IPowerManager.aidl \ - core/java/android/os/IRemoteCallback.aidl \ + core/java/android/os/IRemoteCallback.aidl \ core/java/android/os/IVibratorService.aidl \ - core/java/android/service/wallpaper/IWallpaperConnection.aidl \ - core/java/android/service/wallpaper/IWallpaperEngine.aidl \ - core/java/android/service/wallpaper/IWallpaperService.aidl \ + core/java/android/service/wallpaper/IWallpaperConnection.aidl \ + core/java/android/service/wallpaper/IWallpaperEngine.aidl \ + core/java/android/service/wallpaper/IWallpaperService.aidl \ + core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl\ + core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl\ core/java/android/view/accessibility/IAccessibilityManager.aidl \ core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \ core/java/android/view/IApplicationToken.aidl \ @@ -148,8 +145,8 @@ LOCAL_SRC_FILES += \ core/java/android/view/IWindowSession.aidl \ core/java/android/speech/IRecognitionListener.aidl \ core/java/android/speech/IRecognitionService.aidl \ - core/java/android/speech/tts/ITts.aidl \ - core/java/android/speech/tts/ITtsCallback.aidl \ + core/java/android/speech/tts/ITextToSpeechCallback.aidl \ + core/java/android/speech/tts/ITextToSpeechService.aidl \ core/java/com/android/internal/app/IBatteryStats.aidl \ core/java/com/android/internal/app/IUsageStats.aidl \ core/java/com/android/internal/app/IMediaContainerService.aidl \ @@ -169,6 +166,8 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/view/IInputMethodSession.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/ICountryDetector.aidl \ location/java/android/location/ICountryListener.aidl \ location/java/android/location/IGeocodeProvider.aidl \ @@ -246,6 +245,7 @@ aidl_files := \ frameworks/base/core/java/android/app/Notification.aidl \ frameworks/base/core/java/android/app/PendingIntent.aidl \ frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \ + frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ frameworks/base/core/java/android/content/ComponentName.aidl \ frameworks/base/core/java/android/content/Intent.aidl \ frameworks/base/core/java/android/content/IntentSender.aidl \ @@ -309,13 +309,7 @@ fwbase_dirs_to_document := \ ) \ ) -# Pass a special "fake-out" version of some classes to the doc/API tools. -# ConfigBuildFlags uses this trick to prevent certain fields from appearing -# as "final" in the official SDK APIs. -fwbase_dirs_to_document += core/config/sdk - # include definition of libcore_to_document -# These are relative to libcore include $(LOCAL_PATH)/../../libcore/Docs.mk non_base_dirs := \ @@ -324,8 +318,7 @@ non_base_dirs := \ # These are relative to frameworks/base dirs_to_document := \ $(fwbase_dirs_to_document) \ - $(non_base_dirs) \ - $(addprefix ../../libcore/, $(libcore_to_document)) + $(non_base_dirs) html_dirs := \ $(FRAMEWORKS_BASE_SUBDIRS) \ @@ -334,7 +327,8 @@ html_dirs := \ # These are relative to frameworks/base framework_docs_LOCAL_SRC_FILES := \ $(call find-other-java-files, $(dirs_to_document)) \ - $(call find-other-html-files, $(html_dirs)) + $(call find-other-html-files, $(html_dirs)) \ + $(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) # This is used by ide.mk as the list of source files that are # always included. @@ -376,7 +370,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -werror -hide 113 \ -overview $(LOCAL_PATH)/core/java/overview.html -framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework) +framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON) framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \ frameworks/base/docs/knowntags.txt @@ -455,6 +449,8 @@ web_docs_sample_code_flags := \ resources/samples/WiktionarySimple "Wiktionary (Simplified)" \ -samplecode $(sample_dir)/VoiceRecognitionService \ resources/samples/VoiceRecognitionService "Voice Recognition Service" \ + -samplecode $(sample_dir)/VoicemailProviderDemo \ + resources/samples/VoicemailProviderDemo "Voicemail Provider Demo" \ -samplecode $(sample_dir)/XmlAdapters \ resources/samples/XmlAdapters "XML Adapters" @@ -486,7 +482,7 @@ LOCAL_MODULE := api-stubs LOCAL_DROIDDOC_OPTIONS:=\ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_stubs_current_intermediates/src \ - -apixml $(INTERNAL_PLATFORM_API_FILE) \ + -api $(INTERNAL_PLATFORM_API_FILE) \ -nodocs LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -605,7 +601,7 @@ LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) framework LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR) -LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBRARIES,framework) +LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR) LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) LOCAL_MODULE := hidden @@ -650,6 +646,8 @@ LOCAL_MODULE := ext LOCAL_NO_EMMA_INSTRUMENT := true LOCAL_NO_EMMA_COMPILE := true +LOCAL_DX_FLAGS := --core-library + include $(BUILD_JAVA_LIBRARY) |