am 3db7a730: Merge change 4880 into donut
Merge commit '3db7a730bce818196c216945f866939bf8a7401f'
* commit '3db7a730bce818196c216945f866939bf8a7401f':
Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index e10ef43..7921120 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := samples
+LOCAL_MODULE_TAGS := samples tests
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 43ad49c..1520c43 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -197,6 +197,14 @@
continuous="true"
cts="true" />
+<test name="cts-permission2"
+ build_path="cts/tests/tests/permission2"
+ package="com.android.cts.permission2"
+ runner="android.test.InstrumentationTestRunner"
+ coverage_target="framework"
+ continuous="true"
+ cts="true" />
+
<test name="cts-process"
build_path="cts/tests"
package="com.android.cts.process"