white-list CTS library & fix missing library error
- white-list android.core.tests.libcore.package.libcore
- move ctstestrunner to package
Change-Id: Ica4fb7b81ce901d2fb351829fbeea45478279df6
diff --git a/tests/tests/dpi/Android.mk b/tests/tests/dpi/Android.mk
index b582627..a9dbcc3 100644
--- a/tests/tests/dpi/Android.mk
+++ b/tests/tests/dpi/Android.mk
@@ -19,6 +19,8 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsDpiTestCases
@@ -44,8 +46,6 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
-
LOCAL_MODULE := android.cts.dpi
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
index f278b0f..d34e43a 100644
--- a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
+++ b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
@@ -89,7 +89,10 @@
"com.android.tradefed.utils.wifi",
// Game used for CTS testing...
- "com.replica.replicaisland"
+ "com.replica.replicaisland",
+
+ // CTS test
+ "android.core.tests.libcore.package.libcore"
));
private boolean isWhitelistedPackage(String packageName) {
