diff options
Diffstat (limited to 'services/tests/servicestests/Android.bp')
| -rw-r--r-- | services/tests/servicestests/Android.bp | 73 |
1 files changed, 31 insertions, 42 deletions
diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 5afaf2851bee..237455198e86 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -56,7 +56,6 @@ android_test { "hamcrest-library", "servicestests-utils", "service-jobscheduler", - "service-permission.impl", // TODO: remove once Android migrates to JUnit 4.12, // which provides assertThrows "testng", @@ -108,17 +107,12 @@ android_test { ], java_resources: [ - ":PackageParserTestApp1", - ":PackageParserTestApp2", - ":PackageParserTestApp3", - ":PackageParserTestApp4", - ":PackageParserTestApp5", - ":apex.test", - ":test.rebootless_apex_v1", - ":test.rebootless_apex_v2", ":com.android.apex.cts.shim.v1_prebuilt", ":com.android.apex.cts.shim.v2_different_certificate_prebuilt", ":com.android.apex.cts.shim.v2_unsigned_apk_container_prebuilt", + ":apex.test", + ":test.rebootless_apex_v1", + ":test.rebootless_apex_v2", ], resource_zips: [":FrameworksServicesTests_apks_as_resources"], } @@ -128,6 +122,7 @@ java_library { srcs: [ "src/com/android/server/pm/PackageSettingBuilder.java", "src/com/android/server/am/DeviceConfigSession.java", + "src/com/android/server/pm/parsing/TestPackageParser2.kt", ], static_libs: [ "services.core", @@ -136,6 +131,33 @@ java_library { } java_library { + name: "servicestests-dpm-utils", + srcs: [ + "src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java", + "src/com/android/server/devicepolicy/DevicePolicyManagerTestable.java", + "src/com/android/server/devicepolicy/DpmMockContext.java", + "src/com/android/server/devicepolicy/DpmTestBase.java", + "src/com/android/server/devicepolicy/DpmTestUtils.java", + "src/com/android/server/devicepolicy/DummyDeviceAdmins.java", + "src/com/android/server/devicepolicy/MockSystemServices.java", + "src/com/android/server/devicepolicy/MockUtils.java", + ], + libs: [ + "android.test.mock", + "android.test.base", + "mockito-target-minus-junit4", + ], + static_libs: [ + "frameworks-base-testutils", + "androidx.test.core", + "androidx.test.ext.truth", + "androidx.test.rules", + "services.core", + "services.devicepolicy", + ], +} + +java_library { name: "servicestests-utils", srcs: [ "utils/**/*.java", @@ -178,41 +200,8 @@ filegroup { java_genrule { name: "FrameworksServicesTests_apks_as_resources", srcs: [ - ":FrameworksServicesTests_install", - ":FrameworksServicesTests_install_bad_dex", - ":FrameworksServicesTests_install_complete_package_info", - ":FrameworksServicesTests_install_decl_perm", - ":FrameworksServicesTests_install_intent_filters", - ":FrameworksServicesTests_install_loc_auto", - ":FrameworksServicesTests_install_loc_internal", - ":FrameworksServicesTests_install_loc_sdcard", - ":FrameworksServicesTests_install_loc_unspecified", ":FrameworksServicesTests_install_split_base", ":FrameworksServicesTests_install_split_feature_a", - ":FrameworksServicesTests_install_use_perm_good", - ":FrameworksServicesTests_install_uses_feature", - ":FrameworksServicesTests_install_uses_sdk_0", - ":FrameworksServicesTests_install_uses_sdk_q0", - ":FrameworksServicesTests_install_uses_sdk_q0_r0", - ":FrameworksServicesTests_install_uses_sdk_r0", - ":FrameworksServicesTests_install_uses_sdk_r5", - ":FrameworksServicesTests_install_uses_sdk_r_none", - ":FrameworksServicesTests_install_uses_sdk_r0_s0", - ":FrameworksServicesTests_install_uses_sdk_r0_s5", - ":FrameworksServicesTests_keyset_permdef_sa_unone", - ":FrameworksServicesTests_keyset_permuse_sa_ua_ub", - ":FrameworksServicesTests_keyset_permuse_sb_ua_ub", - ":FrameworksServicesTests_keyset_sa_ua", - ":FrameworksServicesTests_keyset_sa_ua_ub", - ":FrameworksServicesTests_keyset_sa_uab", - ":FrameworksServicesTests_keyset_sa_ub", - ":FrameworksServicesTests_keyset_sa_unone", - ":FrameworksServicesTests_keyset_sab_ua", - ":FrameworksServicesTests_keyset_sau_ub", - ":FrameworksServicesTests_keyset_sb_ua", - ":FrameworksServicesTests_keyset_sb_ub", - ":FrameworksServicesTests_keyset_splat_api", - ":FrameworksServicesTests_keyset_splata_api", ], out: ["FrameworkServicesTests_apks_as_resources.res.zip"], tools: ["soong_zip"], |