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

Commit 370e30dd authored by David Brazdil's avatar David Brazdil Committed by Android (Google) Code Review
Browse files

Merge "Build hidden API DEX signatures with Soong"

parents fd99572d 4f9d4d56

Android.bp

+19 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,6 @@ droiddoc { 
    ],

    api_filename: "public_api.txt",

    removed_api_filename: "removed.txt",

    removed_dex_api_filename: "removed-dex.txt",

    args: framework_docs_args + " -referenceonly -nodocs",

}
@@ -1108,6 +1107,25 @@ java_library_static { 
    ],

}



droiddoc {

    name: "hiddenapi-lists",

    defaults: ["framework-docs-default"],

    arg_files: [

        "core/res/AndroidManifest.xml",

        ":api-version-xml",

        "core/java/overview.html",

        ":current-support-api",

    ],

    private_dex_api_filename: "private-dex.txt",

    removed_dex_api_filename: "removed-dex.txt",

    args: framework_docs_args +

          " -referenceonly" +

          " -nodocs" +

          " -showUnannotated" +

          " -showAnnotation android.annotation.SystemApi" +

          " -showAnnotation android.annotation.TestApi",

}



filegroup {

    name: "apache-http-stubs-sources",

    srcs: [

Android.mk

+0 −32
Original line number Diff line number Diff line
@@ -309,38 +309,6 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) 
$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))

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



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

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 := hidden-api-list



LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-showUnannotated \

		-showAnnotation android.annotation.SystemApi \

		-showAnnotation android.annotation.TestApi \

		-privateDexApi $(INTERNAL_PLATFORM_PRIVATE_DEX_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_PRIVATE_DEX_API_FILE)



# ====  check javadoc comments but don't generate docs ========

include $(CLEAR_VARS)