diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 134 |
1 files changed, 129 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 7c186b7ad2df..d7c16d14656f 100644 --- a/Android.mk +++ b/Android.mk @@ -74,6 +74,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 \ @@ -94,6 +96,7 @@ aidl_files := \ frameworks/base/core/java/android/app/admin/NetworkEvent.aidl \ frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \ frameworks/base/core/java/android/app/admin/PasswordMetrics.aidl \ + frameworks/base/core/java/android/app/slice/ISliceManager.aidl \ frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \ frameworks/base/core/java/android/print/PageRange.aidl \ frameworks/base/core/java/android/print/PrintAttributes.aidl \ @@ -271,7 +274,7 @@ non_base_dirs := \ ../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) + $(call all-java-files-under, test-mock/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)) @@ -280,7 +283,7 @@ framework_base_android_test_runner_excluding_mock_src_files := \ # to document and check apis files_to_check_apis := \ $(call find-other-java-files, \ - legacy-test/src \ + test-base/src \ $(non_base_dirs) \ ) @@ -304,7 +307,6 @@ files_to_check_apis_generated := \ files_to_document := \ $(files_to_check_apis) \ $(call find-other-java-files,\ - $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) \ test-runner/src) # These are relative to frameworks/base @@ -457,6 +459,66 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -federate SupportLib https://developer.android.com \ -federationapi SupportLib prebuilts/sdk/current/support-api.txt +# ==== Public API diff =========================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(framework_docs_LOCAL_API_CHECK_SRC_FILES) +LOCAL_GENERATED_SOURCES := $(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) +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) + +# Hack to get diffs included in docs output +out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip +$(out_zip): $(full_target) + +# ==== System API diff =========================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(framework_docs_LOCAL_API_CHECK_SRC_FILES) +LOCAL_GENERATED_SOURCES := $(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) +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_SYSTEM_API_FILE) + +LOCAL_MODULE := offline-system-sdk-referenceonly + +last_released_sdk_version := $(lastword $(call numerically_sort, \ + $(filter-out current, \ + $(patsubst $(SRC_SYSTEM_API_DIR)/%.txt,%, $(wildcard $(SRC_SYSTEM_API_DIR)/*.txt)) \ + )\ + )) + +LOCAL_APIDIFF_OLDAPI := $(LOCAL_PATH)/../../$(SRC_SYSTEM_API_DIR)/$(last_released_sdk_version) +LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_SYSTEM_API_FILE)) + +include $(BUILD_APIDIFF) + +# Hack to get diffs included in docs output +out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip +$(out_zip): $(full_target) + # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) @@ -637,7 +699,7 @@ $(static_doc_index_redirect): \ $(full_target): $(static_doc_index_redirect) -# ==== static html in the sdk ================================== +# ==== Public API static reference docs ================================== include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) @@ -679,6 +741,51 @@ $(full_target): $(static_doc_index_redirect) $(full_target): $(static_doc_properties) +# ==== System API static reference docs ================================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) +LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) +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:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR) +LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) + +LOCAL_MODULE := offline-system-sdk-referenceonly + +LOCAL_DROIDDOC_OPTIONS:=\ + $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ + -hide 101 -hide 104 -hide 108 \ + -showAnnotation android.annotation.SystemApi \ + -offlinemode \ + -title "Android System SDK" \ + -proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \ + -sdkvalues $(OUT_DOCS) \ + -hdf android.whichdoc offline \ + -referenceonly + +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk + +include $(BUILD_DROIDDOC) + +static_doc_index_redirect := $(out_dir)/index.html +$(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): \ + $(LOCAL_PATH)/docs/source.properties | $(ACP) + $(hide) mkdir -p $(dir $@) + $(hide) $(ACP) $< $@ + +$(full_target): $(static_doc_index_redirect) +$(full_target): $(static_doc_properties) +$(full_target): $(framework_built) + + # ==== docs for the web (on the androiddevdocs app engine server) ======================= include $(CLEAR_VARS) @@ -891,10 +998,27 @@ LOCAL_PROTOC_FLAGS := \ -Iexternal/protobuf/src LOCAL_SOURCE_FILES_ALL_GENERATED := true LOCAL_SRC_FILES := \ + tools/streaming_proto/stream.proto \ + cmds/am/proto/instrumentation_data.proto \ $(call all-proto-files-under, core/proto) \ - $(call all-proto-files-under, libs/incident/proto) + $(call all-proto-files-under, libs/incident/proto) \ + $(call all-proto-files-under, cmds/statsd/src) 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 # ============================================================ |