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

Commit b96dc539 authored Sep 18, 2018 by Nan Zhang Committed by android-build-merger Sep 18, 2018

Merge "Copy api-versions.xml to out/target/common/obj/PACKAGING" into...

Merge "Copy api-versions.xml to out/target/common/obj/PACKAGING" into stage-aosp-master am: 6e0adb27
am: 80027f84

Change-Id: I359dc73ff44539c0520ec81f537bb19745fd931f

parents c808d308 80027f84

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ LOCAL_DONT_MERGE_MANIFESTS:=
		LOCAL_DPI_FILE_STEM:=
		LOCAL_DPI_VARIANTS:=
		LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=
		LOCAL_DROIDDOC_API_VERSIONS_XML :=
		LOCAL_DROIDDOC_ASSET_DIR:=
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=
		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=

core/soong_droiddoc_prebuilt.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -23,3 +23,7 @@ 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_DROIDDOC_API_VERSIONS_XML
		$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_API_VERSIONS_XML),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_generated-api-versions.xml))
		endif