Convert hostsidetests/appsecurity/test-apps/**/Android.mk files to Android.bp
Also, fix numerous cases where test applications
('android_test_helper_app') were declared as tests ('android_test').
See build/soong/README.md for more information.
Bug: 122332514
Test: atest CtsAppSecurityHostTestCases
Change-Id: I5f4ea4843dd57019b0c2c5b0fe16fbbdbe97e0bf
diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
index 806fb92..a236664 100644
--- a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsAccessSerialLegacy",
defaults: ["cts_support_defaults"],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
index 1fc4ec4..747a5d9 100644
--- a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsAccessSerialModern",
defaults: ["cts_support_defaults"],
static_libs: [
diff --git a/hostsidetests/appsecurity/test-apps/Android.bp b/hostsidetests/appsecurity/test-apps/Android.bp
new file mode 100644
index 0000000..09477da
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/Android.bp
@@ -0,0 +1,173 @@
+//
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+android_test_helper_app {
+ name: "CtsUsePermissionApp25",
+ defaults: ["cts_support_defaults"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+ libs: [
+ "CtsExternalStorageTestLib",
+ ],
+ manifest: "UsePermissionApp25/AndroidManifest.xml",
+ srcs: [
+ "UsePermissionApp23/src/com/android/cts/usepermission/UsePermissionTest23.java",
+ ":CtsAppSecurityBasePermissionSrc",
+ ],
+ resource_dirs: ["UsePermissionApp23/res"],
+ // For ACCESS_BACKGROUND_LOCATION
+ platform_apis: true,
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ certificate: ":cts-testkey2",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+ min_sdk_version: "25",
+}
+
+android_test_helper_app {
+ name: "CtsUsePermissionApp26",
+ defaults: ["cts_support_defaults"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+ srcs: [
+ "UsePermissionApp26/src/**/*.java",
+ ":CtsAppSecurityBasePermissionSrc",
+ ],
+ manifest: "UsePermissionApp25/AndroidManifest.xml",
+ resource_dirs: ["UsePermissionApp23/res"],
+ sdk_version: "test_current",
+ min_sdk_version: "26",
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ certificate: ":cts-testkey2",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+}
+
+android_test_helper_app {
+ name: "CtsUsePermissionApp28",
+ defaults: ["cts_support_defaults"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+ srcs: [
+ "UsePermissionApp28/src/**/*.java",
+ ":CtsAppSecurityBasePermissionSrc",
+ ],
+ manifest: "UsePermissionApp28/AndroidManifest.xml",
+ resource_dirs: ["UsePermissionApp23/res"],
+ // For ACCESS_BACKGROUND_LOCATION
+ platform_apis: true,
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ certificate: ":cts-testkey2",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+ min_sdk_version: "28",
+}
+
+android_test_helper_app {
+ name: "CtsUsePermissionApp29",
+ defaults: ["cts_support_defaults"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+
+ srcs: [
+ "UsePermissionApp29/src/**/*.java",
+ ":CtsAppSecurityBasePermissionSrc",
+ ],
+ manifest: "UsePermissionApp29/AndroidManifest.xml",
+ resource_dirs: ["UsePermissionApp23/res"],
+ // For ACCESS_BACKGROUND_LOCATION
+ platform_apis: true,
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ certificate: ":cts-testkey2",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+}
+
+android_test_helper_app {
+ name: "RequestsOnlyCalendarApp22",
+ defaults: ["cts_support_defaults"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+ libs: ["CtsExternalStorageTestLib"],
+ srcs: [
+ "UsePermissionApp22/src/**/*.java",
+ ":CtsAppSecurityBasePermissionSrc",
+ ],
+ manifest: "RequestsOnlyCalendarApp22/AndroidManifest.xml",
+ resource_dirs: ["UsePermissionApp22/res"],
+ // For ACCESS_BACKGROUND_LOCATION
+ platform_apis: true,
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ certificate: ":cts-testkey2",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+ min_sdk_version: "22",
+}
diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
index 734376b..2c3960a 100644
--- a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsAppAccessData",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp b/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
index 7527463..2b59838 100644
--- a/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsAppWithData",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
index 14572b7..6c70ccd 100644
--- a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsApplicationVisibilityCrossUserApp",
defaults: ["cts_defaults"],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp b/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
new file mode 100644
index 0000000..a6e4f83
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
@@ -0,0 +1,46 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+android_test_import {
+ name: "CtsCorruptApkTests_b71360999",
+ apk: "b71360999.apk",
+ presigned: true,
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ]
+}
+
+android_test_import {
+ name: "CtsCorruptApkTests_b71361168",
+ apk: "b71361168.apk",
+ presigned: true,
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ]
+}
+
+android_test_import {
+ name: "CtsCorruptApkTests_b79488511",
+ apk: "b79488511.apk",
+ presigned: true,
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ]
+}
diff --git a/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.mk b/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.mk
deleted file mode 100644
index 9fd8b98..0000000
--- a/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := CtsCorruptApkTests_b71360999
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := b71360999.apk
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := CtsCorruptApkTests_b71361168
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := b71361168.apk
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := CtsCorruptApkTests_b79488511
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := b79488511.apk
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.bp b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.bp
index 3426f22..42242c6 100644
--- a/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsDeclareNonRuntimePermissions",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp b/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
index 6d4bf42..71129b9 100644
--- a/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsAccessDeviceIdentifiers",
defaults: ["cts_support_defaults"],
static_libs: [
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
index fcee875..9e90c0d 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsDocumentClient",
defaults: ["cts_support_defaults"],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
index eb4dbd3..5c499d4 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsDocumentProvider",
defaults: ["cts_support_defaults"],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
index c3feef4..6327598 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEphemeralTestsEphemeralApp1",
defaults: ["cts_support_defaults"],
libs: [
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
index 7cae048..abce8e6 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEphemeralTestsEphemeralApp2",
defaults: ["cts_support_defaults"],
libs: [
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
index 919473b..ae294f8 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEphemeralTestsImplicitApp",
defaults: ["cts_support_defaults"],
static_libs: [
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
index 21a435d..d715a00 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEphemeralTestsNormalApp",
defaults: ["cts_support_defaults"],
static_libs: [
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
index b87b89f..c00a6fc 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEphemeralTestsUnexposedApp",
defaults: ["cts_support_defaults"],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
index ff376bc..85c3bbf 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEphemeralTestsUserApp",
defaults: ["cts_support_defaults"],
static_libs: [
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
index 4159be8..42497c1 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEphemeralTestsUserAppTest",
defaults: ["cts_support_defaults"],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.bp b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.bp
index 355fe26..12bc836 100644
--- a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsEscalateToRuntimePermissions",
defaults: ["cts_support_defaults"],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
index 88f4bb7..1a8c858 100644
--- a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsInstantCookieApp",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
index 8010dff..9a71c16 100644
--- a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsInstantCookieApp2",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
index 677b990..411bccc 100644
--- a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsInstantUpgradeApp",
defaults: ["cts_support_defaults"],
libs: [
diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
index 2a8b244..9f5d35a 100644
--- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsInstrumentationAppDiffCert",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
index 10d6066..8029df5 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsMajorVersion000000000000ffff",
defaults: ["cts_support_defaults"],
srcs: [
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
index 088a757..148d2ee 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsMajorVersion00000000ffffffff",
defaults: ["cts_support_defaults"],
srcs: [
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
index 3df84e4..3efce33 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsMajorVersion000000ff00000000",
defaults: ["cts_support_defaults"],
srcs: [
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
index 7ba4d73..d68a767 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsMajorVersion000000ffffffffff",
defaults: ["cts_support_defaults"],
srcs: [
diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
index 7dfd802..fe3990d 100644
--- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsMultiUserStorageApp",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
index 92b45ec..2e3b6e9 100644
--- a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsOrderedActivityApp",
defaults: ["cts_support_defaults"],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
index 01c36f3..7e1137e 100644
--- a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsPkgAccessApp",
defaults: ["cts_defaults"],
static_libs: [
diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
index 2a86949..54161d6 100644
--- a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsPermissionDeclareAppCompat",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.bp b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.bp
index d2cfed1..c01f8b8 100644
--- a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsPermissionPolicyTest25",
defaults: ["cts_support_defaults"],
static_libs: [
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
index 6b08f1d..3ee6aad 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
@@ -65,3 +65,31 @@
enabled: false,
},
}
+
+//##########################################################
+// Package w/ tests
+
+android_test_helper_app {
+ name: "CtsPrivilegedUpdateTests",
+ defaults: ["cts_support_defaults"],
+ sdk_version: "test_current",
+ static_libs: [
+ "androidx.test.rules",
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+ libs: ["android.test.base.stubs"],
+ // Tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+ srcs: ["src/**/*.java"],
+}
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
deleted file mode 100644
index 4978441..0000000
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-###########################################################
-# Package w/ tests
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules compatibility-device-util-axt ctstestrunner-axt
-LOCAL_JAVA_LIBRARIES := android.test.base.stubs
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-LOCAL_PACKAGE_NAME := CtsPrivilegedUpdateTests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
index bec00bd..f4a5e62 100644
--- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsReadExternalStorageApp",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/RequestsOnlyCalendarApp22/Android.mk b/hostsidetests/appsecurity/test-apps/RequestsOnlyCalendarApp22/Android.mk
deleted file mode 100644
index 75e092b..0000000
--- a/hostsidetests/appsecurity/test-apps/RequestsOnlyCalendarApp22/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- compatibility-device-util-axt \
- ctstestrunner-axt \
- ub-uiautomator
-
-LOCAL_JAVA_LIBRARIES := android.test.base.stubs
-
-LOCAL_SRC_FILES := $(call all-java-files-under, ../UsePermissionApp22/src) \
- ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionActivity.java \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
-LOCAL_RESOURCE_DIR := cts/hostsidetests/appsecurity/test-apps/UsePermissionApp22/res
-
-LOCAL_PACKAGE_NAME := RequestsOnlyCalendarApp22
-
-# For ACCESS_BACKGROUND_LOCATION
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
-LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-LOCAL_MIN_SDK_VERSION := 22
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/ReviewPermissionHelper/Android.bp b/hostsidetests/appsecurity/test-apps/ReviewPermissionHelper/Android.bp
index 4d3e4f6..0a00438 100644
--- a/hostsidetests/appsecurity/test-apps/ReviewPermissionHelper/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ReviewPermissionHelper/Android.bp
@@ -12,20 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "ReviewPermissionHelper",
-
srcs: ["src/**/*.kt"],
-
static_libs: [
"ub-uiautomator",
"androidx.test.rules",
"compatibility-device-util-axt",
],
-
test_suites: [
"cts",
"vts",
"general-tests",
],
-}
\ No newline at end of file
+}
diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
index 662169b..15f04c5 100644
--- a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsSharedUidInstall",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
index ad3fa30..87a9fce 100644
--- a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsSharedUidInstallDiffCert",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
index ff13923..943165f 100644
--- a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsSimpleAppInstall",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
index a427def..64005a0 100644
--- a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsSimpleAppInstallDiffCert",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
index 8414a8d..9017af5 100644
--- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsStorageStatsApp",
defaults: ["cts_support_defaults"],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
index 42f7d09..8085465 100644
--- a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsTargetInstrumentationApp",
defaults: ["cts_support_defaults"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.bp b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.bp
new file mode 100644
index 0000000..9bcf428
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.bp
@@ -0,0 +1,47 @@
+//
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+android_test_helper_app {
+ name: "CtsUsePermissionApp22",
+ defaults: ["cts_support_defaults"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+ srcs: [
+ "src/**/*.java",
+ ":CtsAppSecurityBasePermissionSrc",
+ ],
+ libs: [
+ "CtsExternalStorageTestLib",
+ ],
+ // For ACCESS_BACKGROUND_LOCATION
+ platform_apis: true,
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ certificate: ":cts-testkey2",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+ min_sdk_version: "22",
+}
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk
deleted file mode 100644
index cdebf31..0000000
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- compatibility-device-util-axt \
- ctstestrunner-axt \
- ub-uiautomator
-
-LOCAL_JAVA_LIBRARIES := android.test.base.stubs
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionActivity.java \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
-
-LOCAL_PACKAGE_NAME := CtsUsePermissionApp22
-
-# For ACCESS_BACKGROUND_LOCATION
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
-LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-LOCAL_MIN_SDK_VERSION := 22
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.bp b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.bp
new file mode 100644
index 0000000..5286c5f
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.bp
@@ -0,0 +1,56 @@
+//
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+android_test_helper_app {
+ name: "CtsUsePermissionApp23",
+ defaults: ["cts_support_defaults"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "ctstestrunner-axt",
+ ],
+ libs: [
+ "android.test.base.stubs",
+ "CtsExternalStorageTestLib",
+ ],
+ srcs: [
+ "src/com/android/cts/usepermission/UsePermissionTest23.java",
+ ":CtsAppSecurityBasePermissionSrc",
+ ],
+ // For ACCESS_BACKGROUND_LOCATION
+ platform_apis: true,
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts",
+ "general-tests",
+ ],
+ certificate: ":cts-testkey2",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+ min_sdk_version: "23",
+}
+
+filegroup {
+ name: "CtsAppSecurityBasePermissionSrc",
+ srcs: [
+ "src/com/android/cts/usepermission/BasePermissionActivity.java",
+ "src/com/android/cts/usepermission/BasePermissionsTest.java",
+ ],
+}
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
deleted file mode 100644
index 5665c41..0000000
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- compatibility-device-util-axt \
- ctstestrunner-axt \
- ub-uiautomator
-
-LOCAL_JAVA_LIBRARIES := android.test.base.stubs
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
-
-LOCAL_PACKAGE_NAME := CtsUsePermissionApp23
-
-# For ACCESS_BACKGROUND_LOCATION
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
-LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-LOCAL_MIN_SDK_VERSION := 23
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk
deleted file mode 100644
index 2a55f5b..0000000
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- compatibility-device-util-axt \
- ctstestrunner-axt \
- ub-uiautomator
-
-LOCAL_JAVA_LIBRARIES := android.test.base.stubs
-
-LOCAL_SRC_FILES := $(call all-java-files-under, ../UsePermissionApp23/src) \
- ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
-LOCAL_RESOURCE_DIR := cts/hostsidetests/appsecurity/test-apps/UsePermissionApp23/res
-
-LOCAL_PACKAGE_NAME := CtsUsePermissionApp25
-
-# For ACCESS_BACKGROUND_LOCATION
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
-LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-LOCAL_MIN_SDK_VERSION := 25
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk
deleted file mode 100644
index f3fa527..0000000
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- compatibility-device-util-axt \
- ctstestrunner-axt \
- ub-uiautomator
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionActivity.java \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
-LOCAL_RESOURCE_DIR := cts/hostsidetests/appsecurity/test-apps/UsePermissionApp23/res
-
-LOCAL_PACKAGE_NAME := CtsUsePermissionApp26
-LOCAL_SDK_VERSION := test_current
-LOCAL_MIN_SDK_VERSION := 26
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
-LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp28/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp28/Android.mk
deleted file mode 100644
index 7fa6474..0000000
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp28/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- compatibility-device-util-axt \
- ctstestrunner-axt \
- ub-uiautomator
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionActivity.java \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
-LOCAL_RESOURCE_DIR := cts/hostsidetests/appsecurity/test-apps/UsePermissionApp23/res
-
-LOCAL_PACKAGE_NAME := CtsUsePermissionApp28
-
-# For ACCESS_BACKGROUND_LOCATION
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
-LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-LOCAL_MIN_SDK_VERSION := 28
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp29/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp29/Android.mk
deleted file mode 100644
index e47b61f..0000000
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp29/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- compatibility-device-util-axt \
- ctstestrunner-axt \
- ub-uiautomator
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionActivity.java \
- ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
-LOCAL_RESOURCE_DIR := cts/hostsidetests/appsecurity/test-apps/UsePermissionApp23/res
-
-LOCAL_PACKAGE_NAME := CtsUsePermissionApp29
-
-# For ACCESS_BACKGROUND_LOCATION
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
-LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
index f2e6872..4481d9e 100644
--- a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsV3SigningSchemeRotationTest",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/dummyime/Android.bp b/hostsidetests/appsecurity/test-apps/dummyime/Android.bp
index 931550d..6b3cce5 100644
--- a/hostsidetests/appsecurity/test-apps/dummyime/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/dummyime/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsDummyIme",
defaults: ["cts_support_defaults"],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
index 46398f7..a7a89fd 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningABadUpgradeB",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
index 7c1bfc2..77a7e8d 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningANoDefUpgradeB",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
index 955ba35..fed13ff 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningCBadAUpgradeAB",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
index baf93fc..1ca7814 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetPermDefSigningA",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -31,7 +31,7 @@
}
//apks signed cts-keyset-test-b
-android_test {
+android_test_helper_app {
name: "CtsKeySetPermDefSigningB",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
index 74268ef..8171ac2 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetPermUseSigningA",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -31,7 +31,7 @@
}
//apks signed cts-keyset-test-b
-android_test {
+android_test_helper_app {
name: "CtsKeySetPermUseSigningB",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
index 5ae5945..2ed9a96 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsKeySetTestApp",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
index bd38994..c6d340e 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed by cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAUpgradeA",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -31,7 +31,7 @@
}
//apks signed by cts-keyset-test-b
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningBUpgradeA",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -49,7 +49,7 @@
}
//apks signed by cts-keyset-test-ec-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningEcAUpgradeA",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -67,7 +67,7 @@
}
//apks signed by cts-keyset-test-a and cts-keyset-test-b
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAAndBUpgradeA",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
index c6f9bed..f8c37af 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAUpgradeAAndB",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
index 1e31c12..5094978 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAUpgradeAOrB",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
index 6b71f43..3691f76 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAUpgradeB",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -31,7 +31,7 @@
}
//apks signed cts-keyset-test-b
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningBUpgradeB",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -49,7 +49,7 @@
}
//apks signed by cts-keyset-test-a and cts-keyset-test-c
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAAndCUpgradeB",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
index 722597d..9ad20b6 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSharedUserSigningAUpgradeB",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -31,7 +31,7 @@
}
//apks signed cts-keyset-test-b
-android_test {
+android_test_helper_app {
name: "CtsKeySetSharedUserSigningBUpgradeB",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
index 2592ec3..a6e731b 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed by cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAUpgradeEcA",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
index f337911..6941217 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
//apks signed cts-keyset-test-a
-android_test {
+android_test_helper_app {
name: "CtsKeySetSigningAUpgradeNone",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
index fa834ae..11dea0f 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicyAll",
defaults: ["cts_support_defaults"],
manifest: "AndroidManifest.xml",
@@ -27,7 +27,7 @@
],
}
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicyAllPie",
defaults: ["cts_support_defaults"],
manifest: "AndroidManifestNoName.xml",
@@ -40,7 +40,7 @@
],
}
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicyAllNoName",
defaults: ["cts_support_defaults"],
manifest: "AndroidManifestNoName.xml",
@@ -53,7 +53,7 @@
],
}
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicyAllNoNameDifferentCert",
defaults: ["cts_support_defaults"],
manifest: "AndroidManifestNoName.xml",
@@ -64,4 +64,4 @@
"vts",
"general-tests",
],
-}
\ No newline at end of file
+}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
index 24d33fb..748949e 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayAndroid",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
index 753508b..c9a5584 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayApp",
defaults: ["cts_support_defaults"],
sdk_version: "test_current",
@@ -28,4 +28,4 @@
"vts",
"general-tests",
],
-}
\ No newline at end of file
+}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
index d3ffe9e..01c909a 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicyProduct",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
index c37f8a4..ac6acc1 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicySignatureDifferent",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
index 217e357..ed4f41b 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicySystem",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
index 248a0a6..3e46df9 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayPolicyVendor",
defaults: ["cts_support_defaults"],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
index 5189740..a906453 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-android_test {
+android_test_helper_app {
name: "CtsOverlayTarget",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -30,7 +30,7 @@
],
}
-android_test {
+android_test_helper_app {
name: "CtsOverlayTargetNoOverlayable",
defaults: ["cts_support_defaults"],
sdk_version: "current",
@@ -43,4 +43,4 @@
"vts",
"general-tests",
],
-}
\ No newline at end of file
+}
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp b/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
index e1a0cb3..64aa2a5 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
+android_test_helper_app {
name: "CtsPkgInstallTinyApp",
defaults: ["cts_support_defaults"],
// tag this module as a cts test artifact