StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 550a3b6dd9

Change-Id: I214ca3aef755f961723421062b1ace6ebf1b225c
This commit is contained in:
Nan Zhang
2018-03-20 22:03:45 +00:00
committed by android-build-merger
parent 6d948a6cf5 550a3b6dd9
commit 4db0821c0d
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/config.mk
View File

@@ -961,19 +961,6 @@ 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_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)) 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
INTERNAL_PLATFORM_PRIVATE_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/private.txt
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
INTERNAL_PLATFORM_SYSTEM_PRIVATE_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-private.txt
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
INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-light-greylist.txt 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 INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-dark-greylist.txt
INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-blacklist.txt INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-blacklist.txt

1
core/soong_java_prebuilt.mk
View File

@@ -30,6 +30,7 @@ endif
ifdef LOCAL_DROIDDOC_DOC_ZIP ifdef LOCAL_DROIDDOC_DOC_ZIP
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.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 endif
ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

10
core/tasks/apicheck.mk
View File

@@ -54,7 +54,7 @@ $(eval $(call check-api, \
-error 16 -error 17 -error 18 , \ -error 16 -error 17 -error 18 , \
cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \ cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \
check-public-api, \ 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 # 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, \ -error 25 -error 26 -error 27, \
cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \
check-public-api, \ check-public-api, \
$(call doc-timestamp-for,api-stubs) \ $(OUT_DOCS)/api-stubs-docs-stubs.srcjar \
)) ))
.PHONY: update-public-api .PHONY: update-public-api
@@ -100,7 +100,7 @@ $(eval $(call check-api, \
-error 16 -error 17 -error 18 , \ -error 16 -error 17 -error 18 , \
cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \ cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \
check-system-api, \ 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 # 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, \ -error 25 -error 26 -error 27, \
cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \
check-system-api, \ check-system-api, \
$(call doc-timestamp-for,system-api-stubs) \ $(OUT_DOCS)/system-api-stubs-docs-stubs.srcjar \
)) ))
.PHONY: update-system-api .PHONY: update-system-api
@@ -149,7 +149,7 @@ $(eval $(call check-api, \
-error 25 -error 26 -error 27, \ -error 25 -error 26 -error 27, \
cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \
check-test-api, \ check-test-api, \
$(call doc-timestamp-for,test-api-stubs) \ $(OUT_DOCS)/test-api-stubs-docs-stubs.srcjar \
)) ))
.PHONY: update-test-api .PHONY: update-test-api