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

Commit fac0ac32 authored Oct 21, 2019 by Jerome Gaillard Committed by android-build-merger Oct 21, 2019

Merge "Allow files generated by droidstubs to be copied in the SDK"

am: aa1c6bb4

Change-Id: Iee4b8f2dfcfea343f9c696e230a092d059a344cb

parents 41c41c02 aa1c6bb4

core/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -5080,6 +5080,7 @@ deps := \
		$(target_notice_file_txt) \
		$(tools_notice_file_txt) \
		$(OUT_DOCS)/offline-sdk-timestamp \
		$(SDK_METADATA_FILES) \
		$(SYMBOLS_ZIP) \
		$(COVERAGE_ZIP) \
		$(APPCOMPAT_ZIP) \

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -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:=

core/soong_droiddoc_prebuilt.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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