Merge "Move AppSecurity Tests to hostsidetests"
diff --git a/tests/appsecurity-tests/Android.mk b/hostsidetests/appsecurity/Android.mk
similarity index 100%
rename from tests/appsecurity-tests/Android.mk
rename to hostsidetests/appsecurity/Android.mk
diff --git a/tests/appsecurity-tests/certs/cts-testkey1.pem b/hostsidetests/appsecurity/certs/cts-testkey1.pem
similarity index 100%
rename from tests/appsecurity-tests/certs/cts-testkey1.pem
rename to hostsidetests/appsecurity/certs/cts-testkey1.pem
diff --git a/tests/appsecurity-tests/certs/cts-testkey1.pk8 b/hostsidetests/appsecurity/certs/cts-testkey1.pk8
similarity index 100%
rename from tests/appsecurity-tests/certs/cts-testkey1.pk8
rename to hostsidetests/appsecurity/certs/cts-testkey1.pk8
Binary files differ
diff --git a/tests/appsecurity-tests/certs/cts-testkey1.x509.pem b/hostsidetests/appsecurity/certs/cts-testkey1.x509.pem
similarity index 100%
rename from tests/appsecurity-tests/certs/cts-testkey1.x509.pem
rename to hostsidetests/appsecurity/certs/cts-testkey1.x509.pem
diff --git a/tests/appsecurity-tests/certs/cts-testkey2.pem b/hostsidetests/appsecurity/certs/cts-testkey2.pem
similarity index 100%
rename from tests/appsecurity-tests/certs/cts-testkey2.pem
rename to hostsidetests/appsecurity/certs/cts-testkey2.pem
diff --git a/tests/appsecurity-tests/certs/cts-testkey2.pk8 b/hostsidetests/appsecurity/certs/cts-testkey2.pk8
similarity index 100%
rename from tests/appsecurity-tests/certs/cts-testkey2.pk8
rename to hostsidetests/appsecurity/certs/cts-testkey2.pk8
Binary files differ
diff --git a/tests/appsecurity-tests/certs/cts-testkey2.x509.pem b/hostsidetests/appsecurity/certs/cts-testkey2.x509.pem
similarity index 100%
rename from tests/appsecurity-tests/certs/cts-testkey2.x509.pem
rename to hostsidetests/appsecurity/certs/cts-testkey2.x509.pem
diff --git a/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java b/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AppSecurityTests.java
similarity index 100%
rename from tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
rename to hostsidetests/appsecurity/src/com/android/cts/appsecurity/AppSecurityTests.java
diff --git a/tests/appsecurity-tests/test-apps/Android.mk b/hostsidetests/appsecurity/test-apps/Android.mk
similarity index 100%
rename from tests/appsecurity-tests/test-apps/Android.mk
rename to hostsidetests/appsecurity/test-apps/Android.mk
diff --git a/tests/appsecurity-tests/test-apps/AppAccessData/Android.mk b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/AppAccessData/Android.mk
rename to hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
index 7acfa79..6c31fd9 100644
--- a/tests/appsecurity-tests/test-apps/AppAccessData/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsAppAccessData
# although not strictly necessary, sign this app with different cert than CtsAppWithData
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey2
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/AppAccessData/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/AppAccessData/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/AppAccessData/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/AppAccessData/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java b/hostsidetests/appsecurity/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java
rename to hostsidetests/appsecurity/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java
diff --git a/tests/appsecurity-tests/test-apps/AppWithData/Android.mk b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
similarity index 91%
rename from tests/appsecurity-tests/test-apps/AppWithData/Android.mk
rename to hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
index a167a4b..ae14b7c 100644
--- a/tests/appsecurity-tests/test-apps/AppWithData/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
@@ -24,6 +24,6 @@
LOCAL_PACKAGE_NAME := CtsAppWithData
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey1
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/AppWithData/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/AppWithData/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/AppWithData/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/AppWithData/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/AppWithData/src/com/android/cts/appwithdata/CreatePrivateDataTest.java b/hostsidetests/appsecurity/test-apps/AppWithData/src/com/android/cts/appwithdata/CreatePrivateDataTest.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/AppWithData/src/com/android/cts/appwithdata/CreatePrivateDataTest.java
rename to hostsidetests/appsecurity/test-apps/AppWithData/src/com/android/cts/appwithdata/CreatePrivateDataTest.java
diff --git a/tests/appsecurity-tests/test-apps/InstrumentationAppDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/InstrumentationAppDiffCert/Android.mk
rename to hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
index 1800287..67b2246 100644
--- a/tests/appsecurity-tests/test-apps/InstrumentationAppDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsInstrumentationAppDiffCert
# sign this app with different cert than CtsTargetInstrumentationApp
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey2
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/InstrumentationAppDiffCert/src/com/android/cts/instrumentationdiffcertapp/InstrumentationFailToRunTest.java b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/src/com/android/cts/instrumentationdiffcertapp/InstrumentationFailToRunTest.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/InstrumentationAppDiffCert/src/com/android/cts/instrumentationdiffcertapp/InstrumentationFailToRunTest.java
rename to hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/src/com/android/cts/instrumentationdiffcertapp/InstrumentationFailToRunTest.java
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/Android.mk b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/Android.mk
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk
index e11f931..41ddb64 100644
--- a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsPermissionDeclareApp
# sign this app with a different cert than CtsUsePermissionDiffCert
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey1
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/GrantUriPermission.java b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/GrantUriPermission.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/GrantUriPermission.java
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/GrantUriPermission.java
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProvider.java b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProvider.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProvider.java
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProvider.java
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderGranting.java b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderGranting.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderGranting.java
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderGranting.java
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderPath.java b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderPath.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderPath.java
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PermissionContentProviderPath.java
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProvider.java b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProvider.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProvider.java
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProvider.java
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProviderGranting.java b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProviderGranting.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProviderGranting.java
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/PrivateContentProviderGranting.java
diff --git a/tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/SetInstallerPackage.java b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/SetInstallerPackage.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/SetInstallerPackage.java
rename to hostsidetests/appsecurity/test-apps/PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/SetInstallerPackage.java
diff --git a/tests/appsecurity-tests/test-apps/SharedUidInstall/Android.mk b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/SharedUidInstall/Android.mk
rename to hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk
index 4d77b44..f852c56 100644
--- a/tests/appsecurity-tests/test-apps/SharedUidInstall/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk
@@ -25,7 +25,7 @@
LOCAL_PACKAGE_NAME := CtsSharedUidInstall
# sign this app with a different cert than CtsSharedUidInstallDiffCert
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey1
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_PROGUARD_ENABLED := disabled
diff --git a/tests/appsecurity-tests/test-apps/SharedUidInstall/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SharedUidInstall/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SharedUidInstall/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/SharedUidInstall/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/SharedUidInstall/src/com/android/cts/shareduidinstall/SharedUidActivity.java b/hostsidetests/appsecurity/test-apps/SharedUidInstall/src/com/android/cts/shareduidinstall/SharedUidActivity.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SharedUidInstall/src/com/android/cts/shareduidinstall/SharedUidActivity.java
rename to hostsidetests/appsecurity/test-apps/SharedUidInstall/src/com/android/cts/shareduidinstall/SharedUidActivity.java
diff --git a/tests/appsecurity-tests/test-apps/SharedUidInstallDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/SharedUidInstallDiffCert/Android.mk
rename to hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk
index 4f24e25..3f0a6b6 100644
--- a/tests/appsecurity-tests/test-apps/SharedUidInstallDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsSharedUidInstallDiffCert
# sign this app with a different cert than CtsSharedUidInstall
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey2
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/SharedUidInstallDiffCert/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SharedUidInstallDiffCert/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/SharedUidInstallDiffCert/src/com/android/cts/shareduidinstalldiffcert/SharedUidActivity.java b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/src/com/android/cts/shareduidinstalldiffcert/SharedUidActivity.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SharedUidInstallDiffCert/src/com/android/cts/shareduidinstalldiffcert/SharedUidActivity.java
rename to hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/src/com/android/cts/shareduidinstalldiffcert/SharedUidActivity.java
diff --git a/tests/appsecurity-tests/test-apps/SimpleAppInstall/Android.mk b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/SimpleAppInstall/Android.mk
rename to hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk
index 9ed7a76..f7e0f27 100644
--- a/tests/appsecurity-tests/test-apps/SimpleAppInstall/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsSimpleAppInstall
# sign this app with a different cert than CtsSimpleAppInstallDiffCert
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey1
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/SimpleAppInstall/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SimpleAppInstall/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/SimpleAppInstall/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/SimpleAppInstall/src/com/android/cts/simpleappinstall/SimpleAppActivity.java b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/src/com/android/cts/simpleappinstall/SimpleAppActivity.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SimpleAppInstall/src/com/android/cts/simpleappinstall/SimpleAppActivity.java
rename to hostsidetests/appsecurity/test-apps/SimpleAppInstall/src/com/android/cts/simpleappinstall/SimpleAppActivity.java
diff --git a/tests/appsecurity-tests/test-apps/SimpleAppInstallDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/SimpleAppInstallDiffCert/Android.mk
rename to hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk
index 54959fb..06290be 100644
--- a/tests/appsecurity-tests/test-apps/SimpleAppInstallDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsSimpleAppInstallDiffCert
# sign this app with a different cert than CtsSimpleAppInstall
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey2
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/SimpleAppInstallDiffCert/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SimpleAppInstallDiffCert/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/SimpleAppInstallDiffCert/src/com/android/cts/simpleappinstall/SimpleAppActivity.java b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/src/com/android/cts/simpleappinstall/SimpleAppActivity.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/SimpleAppInstallDiffCert/src/com/android/cts/simpleappinstall/SimpleAppActivity.java
rename to hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/src/com/android/cts/simpleappinstall/SimpleAppActivity.java
diff --git a/tests/appsecurity-tests/test-apps/TargetInstrumentationApp/Android.mk b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/TargetInstrumentationApp/Android.mk
rename to hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk
index 5ebe7d0..532403c 100644
--- a/tests/appsecurity-tests/test-apps/TargetInstrumentationApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsTargetInstrumentationApp
# sign this app with different cert than CtsInstrumentationAppDiffCert
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey1
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/TargetInstrumentationApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/TargetInstrumentationApp/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/TargetInstrumentationApp/src/com/android/cts/targetinstrumentationapp/TargetInstrumentationActivity.java b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/src/com/android/cts/targetinstrumentationapp/TargetInstrumentationActivity.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/TargetInstrumentationApp/src/com/android/cts/targetinstrumentationapp/TargetInstrumentationActivity.java
rename to hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/src/com/android/cts/targetinstrumentationapp/TargetInstrumentationActivity.java
diff --git a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
similarity index 92%
rename from tests/appsecurity-tests/test-apps/UsePermissionDiffCert/Android.mk
rename to hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
index 06ee5ab..44ff270 100644
--- a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
@@ -25,6 +25,6 @@
LOCAL_PACKAGE_NAME := CtsUsePermissionDiffCert
# sign this app with a different cert than CtsPermissionDeclareApp
-LOCAL_CERTIFICATE := cts/tests/appsecurity-tests/certs/cts-testkey2
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/AndroidManifest.xml
similarity index 100%
rename from tests/appsecurity-tests/test-apps/UsePermissionDiffCert/AndroidManifest.xml
rename to hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/AndroidManifest.xml
diff --git a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
rename to hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
diff --git a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ModifyInstallerPackageTest.java b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ModifyInstallerPackageTest.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ModifyInstallerPackageTest.java
rename to hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ModifyInstallerPackageTest.java
diff --git a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriActivity.java b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriActivity.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriActivity.java
rename to hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriActivity.java
diff --git a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriService.java b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriService.java
similarity index 100%
rename from tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriService.java
rename to hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/ReceiveUriService.java