From bdebeee73f52b1dfc207d8d37ac9db6894a55df7 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Tue, 18 Sep 2018 10:48:35 -0700 Subject: [PATCH] Copy api-versions.xml to out/target/common/obj/PACKAGING Test: m -j out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml Bug: b/78245848 Change-Id: I77ecc43cd17baf7d7c414bb11e60045724865f43 Merged-In: I77ecc43cd17baf7d7c414bb11e60045724865f43 --- core/clear_vars.mk | 1 + core/soong_droiddoc_prebuilt.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 97a74ec3df..9972ac19ed 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -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:= diff --git a/core/soong_droiddoc_prebuilt.mk b/core/soong_droiddoc_prebuilt.mk index e2ec88c37f..08df0195ed 100644 --- a/core/soong_droiddoc_prebuilt.mk +++ b/core/soong_droiddoc_prebuilt.mk @@ -24,6 +24,10 @@ 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 + ifdef LOCAL_DROIDDOC_JDIFF_DOC_ZIP $(eval $(call copy-one-file,$(LOCAL_DROIDDOC_JDIFF_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip)) $(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip)