Commit ceb25587 authored Jun 17, 2020 by Sophie Zheng Committed by Automerger Merge Worker Jun 17, 2020

Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist...

Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab2 am: a38bfeab am: fbfb2072 am: eac57120

Original change: https://android-review.googlesource.com/c/platform/build/+/1336765

Change-Id: I619f8da5c4aa073bda0e991e27ed35947ec6c483

core/main.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -1708,6 +1708,11 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED))
		$(call dist-for-goals, dist_files, $(api_xmls))
		api_xmls :=

		ifdef CLANG_COVERAGE
		$(foreach f,$(SOONG_NDK_API_XML), \
		$(call dist-for-goals,droidcore,$(f):ndk_coverage_xml_dir/$(notdir $(f))))
		endif

		# Building a full system-- the default is to build droidcore
		droid_targets: droidcore dist_files