commit 1930a2ebfc7714d5032542781a0c898957bca61f
author Brian Muramatsu <btmura@google.com> Mon Jan 23 10:36:13 2012 -0800
committer Brian Muramatsu <btmura@google.com> Mon Jan 23 10:36:13 2012 -0800
tree a4b8dddd32dea391933c8b5ffe796a44a830bfc9
parent b00a7504b46b250db1399f03c8e9887028e85343
parent a1298934b3a42f6232c0a7199cc01adc39f3750e

resolved conflicts for merge of a1298934 to master

Change-Id: I2e0e2bcc3815d2d4a5f5bf10412c7dc0a248a509

CtsTestCaseList.mk

diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 2c612c3..97e1065 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -34,7 +34,7 @@
 	$(cts_security_apps_list)
 
 cts_external_packages := \
-	replicaisland \
+	com.replica.replicaisland
 
 # Any APKs that need to be copied to the CTS distribution's testcases
 # directory but do not require an associated test package XML.

tests/tests/openglperf/Android.mk

diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk
index 2ea0171..c07969e 100644
--- a/tests/tests/openglperf/Android.mk
+++ b/tests/tests/openglperf/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_PACKAGE_NAME := CtsOpenGlPerfTestCases
 
-LOCAL_INSTRUMENTATION_FOR := replicaisland
+LOCAL_INSTRUMENTATION_FOR := com.replica.replicaisland
 
 LOCAL_SDK_VERSION := current
 

tests/tests/openglperf/AndroidManifest.xml

diff --git a/tests/tests/openglperf/AndroidManifest.xml b/tests/tests/openglperf/AndroidManifest.xml
index 8e48eb0..d687246 100644
--- a/tests/tests/openglperf/AndroidManifest.xml
+++ b/tests/tests/openglperf/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
     <!-- Two activities are used -->
     <instrumentation
-        android:targetPackage="replicaisland"
+        android:targetPackage="com.replica.replicaisland"
         android:name="android.test.InstrumentationTestRunner" />
     <instrumentation
         android:targetPackage="com.android.cts.openglperf"