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

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

Merge "Add dist-for-goals for droiddoc docs.zip"

parents 5fa07c9e 3636fa8b

core/config.mk

+8 −8
Original line number Diff line number Diff line
@@ -979,18 +979,18 @@ TARGET_AVAILABLE_SDK_VERSIONS := test_current core_current $(TARGET_AVAILABLE_SD 
TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT := $(call numbers_less_than,24,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT := $(call numbers_less_than,27,$(TARGET_AVAILABLE_SDK_VERSIONS))



INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.txt

ifndef INTERNAL_PLATFORM_PRIVATE_API_FILE

INTERNAL_PLATFORM_PRIVATE_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/private.txt

endif

ifndef INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE

INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/private-dex.txt

INTERNAL_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/removed.txt

INTERNAL_PLATFORM_SYSTEM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-api.txt

endif

ifndef INTERNAL_PLATFORM_SYSTEM_PRIVATE_API_FILE

INTERNAL_PLATFORM_SYSTEM_PRIVATE_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-private.txt

endif

ifndef INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE

INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-private-dex.txt

INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-removed.txt

INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-exact.txt

INTERNAL_PLATFORM_TEST_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/test-api.txt

INTERNAL_PLATFORM_TEST_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/test-removed.txt

INTERNAL_PLATFORM_TEST_EXACT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/test-exact.txt

endif



INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-light-greylist.txt

INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-dark-greylist.txt

core/soong_java_prebuilt.mk

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ endif 


ifdef LOCAL_DROIDDOC_DOC_ZIP

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip))

$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)

endif



ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

core/tasks/apicheck.mk

+5 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ $(eval $(call check-api, \ 
    -error 16 -error 17 -error 18 -error 31, \

    cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \

    check-public-api, \

    $(call doc-timestamp-for,api-stubs) \

    $(OUT_DOCS)/api-stubs-docs-stubs.srcjar \

    ))



# Check that the API we're building hasn't changed from the not-yet-released
@@ -71,7 +71,7 @@ $(eval $(call check-api, \ 
    -error 25 -error 26 -error 27, \

    cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \

    check-public-api, \

    $(call doc-timestamp-for,api-stubs) \

    $(OUT_DOCS)/api-stubs-docs-stubs.srcjar \

    ))



.PHONY: update-public-api
@@ -100,7 +100,7 @@ $(eval $(call check-api, \ 
    -error 16 -error 17 -error 18 -error 31, \

    cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \

    check-system-api, \

    $(call doc-timestamp-for,system-api-stubs) \

    $(OUT_DOCS)/system-api-stubs-docs-stubs.srcjar \

    ))



# Check that the System API we're building hasn't changed from the not-yet-released
@@ -117,7 +117,7 @@ $(eval $(call check-api, \ 
    -error 25 -error 26 -error 27, \

    cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \

    check-system-api, \

    $(call doc-timestamp-for,system-api-stubs) \

    $(OUT_DOCS)/system-api-stubs-docs-stubs.srcjar \

    ))



.PHONY: update-system-api
@@ -149,7 +149,7 @@ $(eval $(call check-api, \ 
    -error 25 -error 26 -error 27, \

    cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \

    check-test-api, \

    $(call doc-timestamp-for,test-api-stubs) \

    $(OUT_DOCS)/test-api-stubs-docs-stubs.srcjar \

    ))



.PHONY: update-test-api