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

Commit 9f6282d0 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove android.test.mock classes from android.jar 

This removes all android.test.mock from the main android.jar.

This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.mock classes being in android.jar and so
would require yet more changes.

Bug: 30188076
Test: make checkbuild
Change-Id: I3d31e4528c99e2e297aaec9c4b657bdd305bd464
parent 24721ea0

Android.mk

+1 −5
Original line number Diff line number Diff line
@@ -277,9 +277,6 @@ non_base_dirs := \ 
framework_base_android_test_base_src_files := \

  $(call all-java-files-under, test-base/src/junit)



framework_base_android_test_mock_src_files := \

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



framework_base_android_test_runner_src_files := \

  $(call all-java-files-under, test-runner/src/junit)
@@ -311,6 +308,7 @@ files_to_document := \ 
  $(files_to_check_apis) \

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

    test-base/src \

    test-mock/src \

    test-runner/src)



# These are relative to frameworks/base
@@ -331,7 +329,6 @@ framework_docs_LOCAL_SRC_FILES := \ 
# These are relative to frameworks/base

framework_docs_LOCAL_API_CHECK_SRC_FILES := \

  $(framework_base_android_test_base_src_files) \

  $(framework_base_android_test_mock_src_files) \

  $(framework_base_android_test_runner_src_files) \

  $(files_to_check_apis) \

  $(common_src_files) \
@@ -359,7 +356,6 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ 
	icu4j \

	framework \

	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.

api/current.txt

+0 −293

File changed.

Preview size limit exceeded, changes collapsed.

api/removed.txt

+0 −15

File changed.

Preview size limit exceeded, changes collapsed.

api/system-current.txt

+0 −38

File changed.

Preview size limit exceeded, changes collapsed.

api/test-current.txt

+0 −15

File changed.

Preview size limit exceeded, changes collapsed.