Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3550625 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update test to use pre jarjared library" into main

parents a5878cc2 4dc28b3e

services/tests/mockingservicestests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ android_test { 
        "am_flags_lib",

        "device_policy_aconfig_flags_lib",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": ["service-crashrecovery.impl"],

        "true": ["service-crashrecovery-pre-jarjar"],

        default: [],

    }),

services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ android_test { 
        "truth",

        "flag-junit",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": ["service-crashrecovery.impl"],

        "true": ["service-crashrecovery-pre-jarjar"],

        default: [],

    }),

services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ android_test { 
        "truth",

        "flag-junit",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": ["service-crashrecovery.impl"],

        "true": ["service-crashrecovery-pre-jarjar"],

        default: [],

    }),

services/tests/servicestests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ android_test { 
        "com_android_server_accessibility_flags_lib",

        "locksettings_flags_lib",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": ["service-crashrecovery.impl"],

        "true": ["service-crashrecovery-pre-jarjar"],

        default: [],

    }),

tests/PackageWatchdog/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ android_test { 
        "truth",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": [

            "service-crashrecovery.impl",

            "service-crashrecovery-pre-jarjar",

            "framework-crashrecovery.impl",

        ],

        default: [],