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

Commit a0171af0 authored by Jerome Gaillard's avatar Jerome Gaillard
Browse files

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
parent 75d8a470

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