commit 69516f4df7129b39dfa05654b9e5163442438c72
author Paul Duffin <paulduffin@google.com> Wed Nov 15 11:39:14 2017 +0000
committer Colin Cross <ccross@android.com> Tue Dec 12 23:23:31 2017 +0000
tree 3e21c3ef15385e32487c3750cdc43af95c2b21f6
parent eb652a47a180092b397ec40c718dfc13935f7fb6

Separate android.test.mock from test-runner source

Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.

Bug: 30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit e254526f0fe5d22681555bd4a00b7ee96fee1dc1)

Android.mk

diff --git a/Android.mk b/Android.mk
index 6b13708..901562c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -270,7 +270,7 @@
   ../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)
+  $(call all-java-files-under, test-mock/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))