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

Commit 23ea8ad0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Move statsd framework tests to statsd apex dir" into rvc-dev am: 398b3d1c 

Change-Id: I1b44cda940f8f14b094e5656d0a648eb08bd2ddd
parents df09d9f6 398b3d1c

apex/statsd/framework/Android.bp

+24 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ filegroup { 
    ],

    visibility: [

        "//frameworks/base", // For the "global" stubs.

        "//frameworks/base/apex/statsd:__subpackages__",

    ],

}
@@ -74,8 +75,6 @@ java_library { 
    hostdex: true, // for hiddenapi check

    visibility: [

        "//frameworks/base/apex/statsd:__subpackages__",

        // TODO(b/149928788): Remove when tests are moved.

        "//frameworks/base/core/tests/coretests:__pkg__",

    ],

    apex_available: [

        "com.android.os.statsd",
@@ -164,3 +163,26 @@ java_library { 
        "//frameworks/opt/net/wifi/service" // wifi service

    ]

}



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/AndroidManifest.xml

0 → 100644
+26 −0
Original line number 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.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.os.statsd.framework.test"

        >



    <instrumentation

            android:name="androidx.test.runner.AndroidJUnitRunner"

            android:targetPackage="com.android.os.statsd.framework.test"

            android:label="Framework Statsd Tests" />



</manifest>

apex/statsd/framework/test/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit" : [

    {

      "name" : "FrameworkStatsdTest"

    }

  ]

}