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

Commit 6be71277 authored Jul 24, 2018 by Nan Zhang Committed by android-build-merger Jul 24, 2018

Merge "Copy annotations.zip to out/target/common/obj/PACKAGING/" am: 28af1e74

am: e98baf0e

Change-Id: I1d29493da7824be7d6ae09212d3d487ee89fe153

parents d1610f85 e98baf0e

core/clear_vars.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -257,6 +257,7 @@ LOCAL_SOONG_RRO_DIRS :=
	LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=		LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=
	LOCAL_DROIDDOC_STUBS_SRCJAR :=		LOCAL_DROIDDOC_STUBS_SRCJAR :=
	LOCAL_DROIDDOC_DOC_ZIP :=		LOCAL_DROIDDOC_DOC_ZIP :=
			LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=
	# '',true		# '',true
	LOCAL_SOURCE_FILES_ALL_GENERATED:=		LOCAL_SOURCE_FILES_ALL_GENERATED:=
	LOCAL_SRC_FILES:=		LOCAL_SRC_FILES:=

core/soong_java_prebuilt.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,10 @@ $(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE
	$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)		$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)
	endif		endif

			ifdef LOCAL_DROIDDOC_ANNOTATIONS_ZIP
			$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_ANNOTATIONS_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip))
			endif

	ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR		ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
	$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\		$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
	$(intermediates.COMMON)/jacoco-report-classes.jar))		$(intermediates.COMMON)/jacoco-report-classes.jar))