commit df2576045e0edbed05bf4511e0e9ba1038b8f3bb
author Paul Duffin <paulduffin@google.com> Wed Nov 30 13:29:39 2016 +0000
committer Paul Duffin <paulduffin@google.com> Thu Dec 08 14:55:35 2016 +0000
tree c2f71972c597a374f97425ab16fcc26471140cff
parent b92aa5bdfde63e56f1e1e63fbe913638c440ffba

Move android.test classes from core/java to legacy-test/src

(cherry picked from 2395179afb2ea957a9ba66404021c14160361611)

Bug: 30188076
Test: make checkbuild
Merged-In: Ifa291909fcf47da788627b496bd72f54efd78ed7
Change-Id: Ie20dceb9f89df245ed6da5fc2fb06185bd7b104b

Android.mk

diff --git a/Android.mk b/Android.mk
index c0bb724..4285a97f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -502,7 +502,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)
 
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp legacy-test bouncycastle ext
+LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext
 LOCAL_STATIC_JAVA_LIBRARIES := framework-protos
 
 LOCAL_MODULE := framework
@@ -729,6 +729,7 @@
 # Search through the base framework dirs for these packages.
 # The result will be relative to frameworks/base.
 fwbase_dirs_to_document := \
+	legacy-test/src \
 	test-runner/src \
 	$(patsubst $(LOCAL_PATH)/%,%, \
 	  $(wildcard \