diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-06-08 23:26:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-08 23:26:16 +0000 |
| commit | a13de3dac278a38caed245c08d2d7aabeeb1ecd3 (patch) | |
| tree | 22bebce56903f09dc575cd2be10f0dd0074169b5 | |
| parent | 70a9cd292b777ef9bb7e6098cb22f94cba1666ed (diff) | |
| parent | 4f75ee22955799c6f43b2b0ca3c83b31c5f424a9 (diff) | |
| download | base-a13de3dac278a38caed245c08d2d7aabeeb1ecd3.tar.gz | |
Merge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev
| -rw-r--r-- | Android.mk | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/Android.mk b/Android.mk index 2f8fd48b04fc..3553f92ae5e7 100644 --- a/Android.mk +++ b/Android.mk @@ -650,42 +650,6 @@ $(static_doc_index_redirect): \ $(full_target): $(static_doc_index_redirect) -# ==== Metalava static html in the sdk ================================== -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 := metalava-offline-sdk -LOCAL_DROIDDOC_USE_METALAVA := true - -# TODO(nanzhang): Remove -hide, and -since flags for this module. -LOCAL_DROIDDOC_OPTIONS:=\ - $(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \ - --generate-api-levels $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-versions.xml \ - --apply-api-levels $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-versions.xml \ - --android-jar-pattern prebuilts/tools/common/api-versions/android-%/android.jar \ - --android-jar-pattern prebuilts/sdk/%/android.jar \ - --current-version $(PLATFORM_SDK_VERSION) \ - --current-codename $(PLATFORM_VERSION_CODENAME) \ - --generate-documentation \ - $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ - -offlinemode \ - -title "Android SDK" \ - -proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \ - -sdkvalues $(OUT_DOCS) \ - -hdf android.whichdoc offline - -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk - -include $(BUILD_DROIDDOC) # ==== Public API static reference docs ================================== include $(CLEAR_VARS) @@ -803,44 +767,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk include $(BUILD_DROIDDOC) -# ==== Metalava docs for the web (on the androiddevdocs app engine server) ======================= -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_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) -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_ADDITIONAL_HTML_DIR:=docs/html-intl / - -LOCAL_MODULE := metalava-online-sdk -LOCAL_DROIDDOC_USE_METALAVA := true - -LOCAL_DROIDDOC_OPTIONS:= \ - $(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \ - --generate-api-levels $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-versions.xml \ - --apply-api-levels $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-versions.xml \ - --android-jar-pattern prebuilts/tools/common/api-versions/android-%/android.jar \ - --android-jar-pattern prebuilts/sdk/%/android.jar \ - --current-version $(PLATFORM_SDK_VERSION) \ - --current-codename $(PLATFORM_VERSION_CODENAME) \ - --generate-documentation \ - $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ - -toroot / \ - -hdf android.whichdoc online \ - $(sample_groups) \ - -hdf android.hasSamples true \ - -samplesdir $(samples_dir) - -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk - -include $(BUILD_DROIDDOC) - # ==== docs for the web (on the androiddevdocs app engine server) ======================= include $(CLEAR_VARS) |