Merge change 4880 into donut
* changes: Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
LOCAL_PATH:= $(call my-dir)
|
LOCAL_PATH:= $(call my-dir)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_MODULE_TAGS := samples
|
LOCAL_MODULE_TAGS := samples tests
|
||||||
|
|
||||||
# Only compile source java files in this apk.
|
# Only compile source java files in this apk.
|
||||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
||||||
|
|||||||
@@ -185,6 +185,14 @@ Native tests:
|
|||||||
continuous="true"
|
continuous="true"
|
||||||
cts="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"
|
<test name="cts-process"
|
||||||
build_path="cts/tests"
|
build_path="cts/tests"
|
||||||
package="com.android.cts.process"
|
package="com.android.cts.process"
|
||||||
|
|||||||
Reference in New Issue
Block a user