commit c3fc20dc4dc7fd197070d2ec16b70e1b30ba37dc
author Chenjie Luo <cjluo@google.com> Wed Sep 17 02:30:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 17 02:30:43 2014 +0000
tree 8fc966c9f21c06313dc74042f7d7c943b396f70c
parent 25d2b2a03199429bb744f103cced9939636edf22
parent 693ed406dfa71dbf8fcfa8c2b91337e6de36cde0

Merge "Move android.location and android.location2 out of CtsTestStubs" into lmp-dev

CtsTestCaseList.mk

diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index d90f4fb..c514901 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -91,6 +91,7 @@
     CtsJniTestCases \
     CtsKeystoreTestCases \
     CtsLocationTestCases \
+    CtsLocation2TestCases \
     CtsMediaStressTestCases \
     CtsMediaTestCases \
     CtsNativeOpenGLTestCases \

tests/tests/location/Android.mk

diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk
index 2503fc7..02de2f2 100644
--- a/tests/tests/location/Android.mk
+++ b/tests/tests/location/Android.mk
@@ -27,8 +27,6 @@
 
 LOCAL_PACKAGE_NAME := CtsLocationTestCases
 
-LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_CTS_PACKAGE)

tests/tests/location2/Android.mk

diff --git a/tests/tests/location2/Android.mk b/tests/tests/location2/Android.mk
index 6daca72..5b227b2 100644
--- a/tests/tests/location2/Android.mk
+++ b/tests/tests/location2/Android.mk
@@ -27,8 +27,6 @@
 
 LOCAL_PACKAGE_NAME := CtsLocation2TestCases
 
-LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-
 # uncomment when Location.EXTRA_NO_GPS_LOCATION is removed
 #LOCAL_SDK_VERSION := curren