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

Commit 2f621549 authored by Dan Shi's avatar Dan Shi Committed by android-build-merger
Browse files

Merge "Fix dependency on APK used by test" am: 85d2ac2e 

am: 6bbd7c4c

Change-Id: Iafa0383ba571d4c72e37ca7f2b68f1cb7a0bc025
parents 2f462866 6bbd7c4c

core/tests/coretests/Android.bp

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




    resource_dirs: ["res"],

    resource_dirs: ["res"],

    resource_zips: [":FrameworksCoreTests_apks_as_resources"],

    resource_zips: [":FrameworksCoreTests_apks_as_resources"],



    data: [":BstatsTestApp"],

}

}





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

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

core/tests/coretests/BstatsTestApp/Android.bp

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

android_test_helper_app {

    name: "BstatsTestApp",

    name: "BstatsTestApp",





    test_suites: [

        "device-tests",

    ],



    static_libs: ["coretests-aidl"],

    static_libs: ["coretests-aidl"],





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

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

services/tests/servicestests/Android.bp

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

    optimize: {

        enabled: false,

        enabled: false,

    },

    },



    data: [":JobTestApp"],

}

}





java_library {

java_library {

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

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




    sdk_version: "current",

    sdk_version: "current",





    test_suites: ["device-tests"],



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

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





    dex_preopt: {

    dex_preopt: {

tools/preload-check/Android.bp

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

    libs: ["tradefed"],

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

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

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

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

}
 
}