Merge "Refactor in preparation for removing android.test.mock"

# The result will be relative to frameworks/base.

fwbase_dirs_to_document := \

	legacy-test/src \

	test-runner/src \

	$(patsubst $(LOCAL_PATH)/%,%, \

	  $(wildcard \

	    $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \

	../opt/net/voip/src/java/android/net/rtp \

	../opt/net/voip/src/java/android/net/sip

framework_base_android_test_mock_src_files := \

	$(call all-java-files-under, test-runner/src/android/test/mock)

framework_base_android_test_runner_excluding_mock_src_files := \

	$(filter-out $(framework_base_android_test_mock_src_files), $(call all-java-files-under, test-runner/src))

# These are relative to frameworks/base

dirs_to_check_apis := \

  $(fwbase_dirs_to_document) \

# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk

dirs_to_document := \

	$(dirs_to_check_apis) \

	test-runner/src \

	$(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS))

patterns_to_not_document := \

# These are relative to frameworks/base

framework_docs_LOCAL_API_CHECK_SRC_FILES := \

	$(call find-other-java-files, $(dirs_to_check_apis)) \

	$(framework_base_android_test_mock_src_files) \

	$(framework_base_android_test_runner_excluding_mock_src_files) \

	$(call all-java-files-under, $(dirs_to_check_apis)) \

	$(common_src_files)

# This is used by ide.mk as the list of source files that are

	ext \

	icu4j \

	framework \

	voip-common

	voip-common \

	android.test.mock \

# Platform docs can refer to Support Library APIs, but we don't actually build

# them as part of the docs target, so we need to include them on the classpath.