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

Commit 85f2f3cd authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Automerger Merge Worker
Browse files

Merge "Add FrameworkStatsdTest to mts" into rvc-dev am: 5c8ac36d am:... 

Merge "Add FrameworkStatsdTest to mts" into rvc-dev am: 5c8ac36d am: 8d58c893 am: a56e2ccb am: 7ae8e56b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869280

Change-Id: I12612ddcda9e05bb8f0d9955250270c3997c3d9a
parents e9b5cec5 7ae8e56b

apex/statsd/framework/Android.bp

+1 −24
Original line number Original line Diff line number Diff line
@@ -90,26 +90,3 @@ java_sdk_library { 
        "test_com.android.os.statsd",

        "test_com.android.os.statsd",

    ],

    ],

}
 
}
 


android_test {

    name: "FrameworkStatsdTest",

    platform_apis: true,

    srcs: [

        // TODO(b/147705194): Use framework-statsd as a lib dependency instead.

        ":framework-statsd-sources",

        "test/**/*.java",

    ],

    manifest: "test/AndroidManifest.xml",

    static_libs: [

        "androidx.test.rules",

        "truth-prebuilt",

    ],

    libs: [

        "android.test.runner.stubs",

        "android.test.base.stubs",

    ],

    test_suites: [

        "device-tests",

    ],

}

apex/statsd/framework/test/Android.bp

0 → 100644
+36 −0
Original line number Original line Diff line number Diff line 
// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



android_test {

    name: "FrameworkStatsdTest",

    platform_apis: true,

    srcs: [

        // TODO(b/147705194): Use framework-statsd as a lib dependency instead.

        ":framework-statsd-sources",

        "**/*.java",

    ],

    manifest: "AndroidManifest.xml",

    static_libs: [

        "androidx.test.rules",

        "truth-prebuilt",

    ],

    libs: [

        "android.test.runner.stubs",

        "android.test.base.stubs",

    ],

    test_suites: [

        "device-tests",

        "mts",

    ],

}
 
 No newline at end of file

apex/statsd/framework/test/AndroidTest.xml

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs Tests for Statsd.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="test-file-name" value="FrameworkStatsdTest.apk" />

        <option name="install-arg" value="-g" />

    </target_preparer>



    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="mts" />

    <option name="test-tag" value="FrameworkStatsdTest" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.os.statsd.framework.test" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>



    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.os.statsd" />

    </object>

</configuration>
 
 No newline at end of file