commit 2395179afb2ea957a9ba66404021c14160361611
author Paul Duffin <paulduffin@google.com> Wed Nov 30 13:29:39 2016 +0000
committer Paul Duffin <paulduffin@google.com> Thu Dec 08 14:49:35 2016 +0000
tree 53d28f10a2f8edb0baa3a046afa04bfbe1c270aa
parent 3c41744b8cab0eb540dee45a7f986bf25d78188e

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

Bug: 30188076
Test: make checkbuild
Change-Id: Ifa291909fcf47da788627b496bd72f54efd78ed7

Android.mk

diff --git a/Android.mk b/Android.mk
index 7099848..85c494d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -519,7 +519,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                                    \
@@ -757,6 +757,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 \