Merge "Re-apply ndk-docs rule." (cf2da22a) · Commits · e / os / android_build

core/Makefile

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,27 @@ $(gen): frameworks/base/docs/docs-redirect-index.html
	@cp -f $< $@		@cp -f $< $@
	endif		endif

			ndk_doxygen_out := $(OUT_NDK_DOCS)
			ndk_headers := $(SOONG_OUT_DIR)/ndk/sysroot/usr/include
			ndk_docs_src_dir := frameworks/native/docs
			ndk_doxyfile := $(ndk_docs_src_dir)/Doxyfile
			ifneq ($(wildcard $(ndk_docs_src_dir)),)
			ndk_docs_srcs := $(addprefix $(ndk_docs_src_dir)/,\
			$(call find-files-in-subdirs,$(ndk_docs_src_dir),"*",.))
			$(ndk_doxygen_out)/index.html: $(ndk_docs_srcs) $(SOONG_OUT_DIR)/ndk.timestamp
			@mkdir -p $(ndk_doxygen_out)
			@echo "Generating NDK docs to $(ndk_doxygen_out)"
			@( cat $(ndk_doxyfile); \
			echo "INPUT=$(ndk_headers)"; \
			echo "HTML_OUTPUT=$(ndk_doxygen_out)" \
			) \| doxygen -

			# Note: Not a part of the docs target because we don't have doxygen available.
			# You can run this target locally if you have doxygen installed.
			ndk-docs: $(ndk_doxygen_out)/index.html
			.PHONY: ndk-docs
			endif

	# -----------------------------------------------------------------		# -----------------------------------------------------------------
	# property_overrides_split_enabled		# property_overrides_split_enabled
	property_overrides_split_enabled :=		property_overrides_split_enabled :=

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -343,6 +343,7 @@ HOST_COMMON_OUT_ROOT := $(HOST_OUT_ROOT)/common
	PRODUCT_OUT := $(TARGET_PRODUCT_OUT_ROOT)/$(TARGET_DEVICE)		PRODUCT_OUT := $(TARGET_PRODUCT_OUT_ROOT)/$(TARGET_DEVICE)

	OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs		OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs
			OUT_NDK_DOCS := $(TARGET_COMMON_OUT_ROOT)/ndk-docs

	BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin		BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin
	SOONG_HOST_OUT_EXECUTABLES := $(SOONG_HOST_OUT)/bin		SOONG_HOST_OUT_EXECUTABLES := $(SOONG_HOST_OUT)/bin