diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/Android.mk b/Android.mk index 3b44255c4a62..69c8c2cae858 100644 --- a/Android.mk +++ b/Android.mk @@ -71,8 +71,6 @@ LOCAL_SRC_FILES += \ core/java/android/accounts/IAccountManagerResponse.aidl \ core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ - core/java/android/app/IActivityContainer.aidl \ - core/java/android/app/IActivityContainerCallback.aidl \ core/java/android/app/IActivityController.aidl \ core/java/android/app/IActivityManager.aidl \ core/java/android/app/IActivityPendingResult.aidl \ @@ -84,6 +82,7 @@ LOCAL_SRC_FILES += \ core/java/android/app/ITaskStackListener.aidl \ core/java/android/app/IBackupAgent.aidl \ core/java/android/app/IEphemeralResolver.aidl \ + core/java/android/app/IInputForwarder.aidl \ core/java/android/app/IInstantAppResolver.aidl \ core/java/android/app/IInstrumentationWatcher.aidl \ core/java/android/app/INotificationManager.aidl \ @@ -440,10 +439,6 @@ LOCAL_SRC_FILES += \ location/java/android/location/INetInitiatedListener.aidl \ location/java/com/android/internal/location/ILocationProvider.aidl \ media/java/android/media/IAudioService.aidl \ - ../av/drm/libmediadrm/aidl/android/media/ICas.aidl \ - ../av/drm/libmediadrm/aidl/android/media/ICasListener.aidl \ - ../av/drm/libmediadrm/aidl/android/media/IDescrambler.aidl \ - ../av/drm/libmediadrm/aidl/android/media/IMediaCasService.aidl \ media/java/android/media/IAudioFocusDispatcher.aidl \ media/java/android/media/IAudioRoutesObserver.aidl \ media/java/android/media/IMediaHTTPConnection.aidl \ @@ -506,7 +501,7 @@ LOCAL_SRC_FILES += \ 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/IDownloadProgressListener.aidl \ telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \ telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \ telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \ @@ -616,6 +611,8 @@ 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 @@ -648,7 +645,6 @@ 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 \ @@ -716,7 +712,9 @@ 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/ProgramSelector.aidl \ frameworks/base/core/java/android/hardware/radio/RadioManager.aidl \ + frameworks/base/core/java/android/hardware/radio/RadioMetadata.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 \ @@ -732,6 +730,7 @@ aidl_files := \ frameworks/base/core/java/android/os/DropBoxManager.aidl \ frameworks/base/core/java/android/os/Bundle.aidl \ frameworks/base/core/java/android/os/Debug.aidl \ + frameworks/base/core/java/android/os/SharedMemory.aidl \ frameworks/base/core/java/android/os/StrictMode.aidl \ frameworks/base/core/java/android/accessibilityservice/AccessibilityServiceInfo.aidl \ frameworks/base/core/java/android/net/Network.aidl \ @@ -876,7 +875,6 @@ packages_to_document := \ # The result will be relative to frameworks/base. fwbase_dirs_to_document := \ legacy-test/src \ - test-runner/src \ $(patsubst $(LOCAL_PATH)/%,%, \ $(wildcard \ $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \ @@ -894,6 +892,12 @@ non_base_dirs := \ ../opt/net/voip/src/java/android/net/rtp \ ../opt/net/voip/src/java/android/net/sip +framework_base_android_test_mock_src_files := \ + $(call all-java-files-under, test-runner/src/android/test/mock) + +framework_base_android_test_runner_excluding_mock_src_files := \ + $(filter-out $(framework_base_android_test_mock_src_files), $(call all-java-files-under, test-runner/src)) + # These are relative to frameworks/base dirs_to_check_apis := \ $(fwbase_dirs_to_document) \ @@ -913,8 +917,8 @@ endef # FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk dirs_to_document := \ $(dirs_to_check_apis) \ - $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) \ - $(addprefix ../../, $(FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS)) \ + test-runner/src \ + $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) patterns_to_not_document := \ $(call find-no-docs-pattern, $(dirs_to_document)) @@ -936,7 +940,9 @@ framework_docs_LOCAL_SRC_FILES := \ # These are relative to frameworks/base framework_docs_LOCAL_API_CHECK_SRC_FILES := \ - $(call find-other-java-files, $(dirs_to_check_apis)) \ + $(framework_base_android_test_mock_src_files) \ + $(framework_base_android_test_runner_excluding_mock_src_files) \ + $(call all-java-files-under, $(dirs_to_check_apis)) \ $(common_src_files) # This is used by ide.mk as the list of source files that are @@ -960,8 +966,11 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ ext \ icu4j \ framework \ - voip-common + voip-common \ + android.test.mock \ +# Platform docs can refer to Support Library APIs, but we don't actually build +# them as part of the docs target, so we need to include them on the classpath. framework_docs_LOCAL_JAVA_LIBRARIES := \ $(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) \ $(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES) @@ -1008,16 +1017,11 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -werror -hide 111 -hide 113 -hide 121 \ -overview $(LOCAL_PATH)/core/java/overview.html \ -# Allow the support library to add its own droiddoc options. -include $(LOCAL_PATH)/../support/droiddoc.mk - framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \ $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON) framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \ - $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) \ - $(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)) \ - $(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib)-res,,COMMON)) + $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \ frameworks/base/docs/knowntags.txt \ @@ -1060,6 +1064,11 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -resourcesdir $(LOCAL_PATH)/docs/html/reference/images/ \ -resourcesoutdir reference/android/images/ +# Federate Support Library references against local API file. +framework_docs_LOCAL_DROIDDOC_OPTIONS += \ + -federate SupportLib https://developer.android.com \ + -federationapi SupportLib prebuilts/sdk/current/support-api.txt + # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) |