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

Commit 85d2ac2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix dependency on APK used by test"

parents 753f6c3e bcef6ae6

core/tests/coretests/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ android_test { 


    resource_dirs: ["res"],

    resource_zips: [":FrameworksCoreTests_apks_as_resources"],



    data: [":BstatsTestApp"],

}



// Rules to copy all the test apks to the intermediate raw resource directory

core/tests/coretests/BstatsTestApp/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
android_test_helper_app {

    name: "BstatsTestApp",



    test_suites: [

        "device-tests",

    ],



    static_libs: ["coretests-aidl"],



    srcs: ["**/*.java"],

services/tests/servicestests/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ android_test { 
    optimize: {

        enabled: false,

    },



    data: [":JobTestApp"],

}



java_library {

services/tests/servicestests/test-apps/JobTestApp/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ android_test_helper_app { 


    sdk_version: "current",



    test_suites: ["device-tests"],



    srcs: ["**/*.java"],



    dex_preopt: {

tools/preload-check/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -19,4 +19,5 @@ java_test_host { 
    libs: ["tradefed"],

    test_suites: ["general-tests"],

    required: ["preload-check-device"],

    data: [":preload-check-device"],

}