diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2019-11-19 04:29:16 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-19 04:29:16 -0800 |
| commit | e5ab595059b9d6618950fc2a4f945011bd24eadc (patch) | |
| tree | ed91cd87c9b60e7bca144f5132f28a495db952c9 | |
| parent | 12489ad00b371eaa1a1de6f3cbcffea2003ada93 (diff) | |
| parent | 8be676d24a8a83cef9d4e132d82370f2f02129a2 (diff) | |
| download | build-e5ab595059b9d6618950fc2a4f945011bd24eadc.tar.gz | |
Allow files generated by droidstubs to be copied in the SDK am: 7aa3039ef9
am: 8be676d24a
Change-Id: Ifd141dd407eadacc4bcc6b5002b7d66da8d3d6d5
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/soong_droiddoc_prebuilt.mk | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 9c0804e615..cf062a2d28 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4777,6 +4777,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 d67c9f86b2..b4452e1d44 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 bf1f10bd99..c0467df2be 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 |