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

Commit bcef6ae6 authored by Dan Shi's avatar Dan Shi
Browse files

Fix dependency on APK used by test 

Use data attribute to include the APK used for the test.

Bug: 138416078
Test: atest
Change-Id: Iffeca6c5f487c6a164acb9c880a5b6405eff424d
parent 434e4fdf

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
@@ -78,6 +78,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"],

}