From 7aa3039ef91396cb8edf3573b10e6b9e3427b0d5 Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Thu, 10 Oct 2019 19:35:08 +0100 Subject: [PATCH] Allow files generated by droidstubs to be copied in the SDK We need to get files generated by a droidstubs target into the SDK. So we first copy them into the out/target/common/obj/PACKAGING folder where they can be picked up by the SDK build. Bug: 142480924 Test: m sdk Change-Id: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f Merged-In: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f --- core/Makefile | 1 + core/clear_vars.mk | 1 + core/soong_droiddoc_prebuilt.mk | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/core/Makefile b/core/Makefile index 658c7b376..0d5bd9061 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4742,6 +4742,7 @@ deps := \ $(target_notice_file_txt) \ $(tools_notice_file_txt) \ $(OUT_DOCS)/offline-sdk-timestamp \ + $(SDK_METADATA_FILES) \ $(SYMBOLS_ZIP) \ $(COVERAGE_ZIP) \ $(APPCOMPAT_ZIP) \ diff --git a/core/clear_vars.mk b/core/clear_vars.mk index d67c9f86b..b4452e1d4 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -73,6 +73,7 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:= LOCAL_DROIDDOC_DOC_ZIP := LOCAL_DROIDDOC_JDIFF_DOC_ZIP := LOCAL_DROIDDOC_HTML_DIR:= +LOCAL_DROIDDOC_METADATA_ZIP:= LOCAL_DROIDDOC_OPTIONS:= LOCAL_DROIDDOC_SOURCE_PATH:= LOCAL_DROIDDOC_STUB_OUT_DIR:= diff --git a/core/soong_droiddoc_prebuilt.mk b/core/soong_droiddoc_prebuilt.mk index bf1f10bd9..c0467df2b 100644 --- a/core/soong_droiddoc_prebuilt.mk +++ b/core/soong_droiddoc_prebuilt.mk @@ -38,3 +38,7 @@ ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip .PHONY: $(LOCAL_MODULE) $(LOCAL_MODULE)-jdiff $(LOCAL_MODULE) $(LOCAL_MODULE)-jdiff : $(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip endif + +ifdef LOCAL_DROIDDOC_METADATA_ZIP +$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_METADATA_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)-metadata.zip)) +endif