Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4827fc32 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove Make side (system/test-)api-stubs droiddoc targets" into pi-dev-plus-aosp

parents 09a55d33 7bfac8dc

Android.bp

+14 −26
Original line number Diff line number Diff line
@@ -1016,6 +1016,7 @@ doc_defaults { 
    ],

    resourcesdir: "docs/html/reference/images",

    resourcesoutdir: "reference/android/images",

    installable: false,

}



droiddoc {
@@ -1027,14 +1028,9 @@ droiddoc { 
        "core/java/overview.html",

        ":current-support-api",

    ],

    args: framework_docs_args +

          "-referenceonly -api $(genDir)/PACKAGING/public_api.txt -privateApi $(genDir)/PACKAGING/private.txt "+

          "-privateDexApi $(genDir)/PACKAGING/private-dex.txt -removedApi $(genDir)/PACKAGING/removed.txt -nodocs",

    out: [

        "PACKAGING/public_api.txt",

        "PACKAGING/private.txt",

        "PACKAGING/private-dex.txt",

    ]

    api_filename: "public_api.txt",

    removed_api_filename: "removed.txt",

    args: framework_docs_args + " -referenceonly -nodocs",

}



droiddoc {
@@ -1046,16 +1042,11 @@ droiddoc { 
        "core/java/overview.html",

        ":current-support-api",

    ],

    args: framework_docs_args +

          "-referenceonly -showAnnotation android.annotation.SystemApi " +

          "-api $(genDir)/PACKAGING/system-api.txt -privateApi $(genDir)/PACKAGING/system-private.txt " +

          "-privateDexApi $(genDir)/PACKAGING/system-private-dex.txt -removedApi $(genDir)/PACKAGING/system-removed.txt " +

          "-exactApi $(genDir)/PACKAGING/system-exact.txt -nodocs",

    out: [

        "PACKAGING/system-api.txt",

        "PACKAGING/system-private.txt",

        "PACKAGING/system-private-dex.txt",

    ]

    api_tag_name: "SYSTEM",

    api_filename: "system-api.txt",

    removed_api_filename: "system-removed.txt",

    exact_api_filename: "system-exact.txt",

    args: framework_docs_args + " -referenceonly -showAnnotation android.annotation.SystemApi -nodocs",

}



droiddoc {
@@ -1067,12 +1058,9 @@ droiddoc { 
        "core/java/overview.html",

        ":current-support-api",

    ],

    args: framework_docs_args +

          "-referenceonly -showAnnotation android.annotation.TestApi " +

          "-api $(genDir)/PACKAGING/test-api.txt " +

          "-removedApi $(genDir)/PACKAGING/test-removed.txt " +

          "-exactApi $(genDir)/PACKAGING/test-exact.txt -nodocs",

    out: [

        "PACKAGING/test-api.txt",

    ]

    api_tag_name: "TEST",

    api_filename: "test-api.txt",

    removed_api_filename: "test-removed.txt",

    exact_api_filename: "test-exact.txt",

    args: framework_docs_args + " -referenceonly -showAnnotation android.annotation.TestApi -nodocs",

}

Android.mk

+0 −105
Original line number Diff line number Diff line
@@ -312,113 +312,8 @@ include $(BUILD_APIDIFF) 
out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip

$(out_zip): $(full_target)



# ====  the api stubs and current.xml ===========================

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_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_API_CHECK_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := api-stubs



LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_stubs_current_intermediates/src



LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-api $(INTERNAL_PLATFORM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \

		-nodocs



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_DROIDDOC)



$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_API_FILE) \

                                          $(INTERNAL_PLATFORM_REMOVED_API_FILE)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))



# ====  the system api stubs ===================================

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_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_API_CHECK_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := system-api-stubs



LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_system_stubs_current_intermediates/src



LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-showAnnotation android.annotation.SystemApi \

		-api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \

		-exactApi $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE) \

		-nodocs



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_DROIDDOC)



$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \

                                          $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \

                                          $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))



# ====  the test api stubs ===================================

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_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_API_CHECK_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := test-api-stubs



LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src



LOCAL_DROIDDOC_OPTIONS:=\

               $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

               -referenceonly \

               -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src \

               -showAnnotation android.annotation.TestApi \

               -api $(INTERNAL_PLATFORM_TEST_API_FILE) \

               -removedApi $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \

               -exactApi $(INTERNAL_PLATFORM_TEST_EXACT_API_FILE) \

               -nodocs



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_DROIDDOC)



$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_TEST_API_FILE) \

                                          $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \

                                          $(INTERNAL_PLATFORM_TEST_EXACT_API_FILE)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))



# ====  the complete hidden api list ===================================