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

Commit fe1e6bc3 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Automerger Merge Worker
Browse files

Merge "Add libincident_test to MTS" into rvc-dev am: 003ef490 am: 40c4fad2... 

Merge "Add libincident_test to MTS" into rvc-dev am: 003ef490 am: 40c4fad2 am: 09495218 am: 78f4bb2f

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

Change-Id: I044ba34514bcd01c8f1d61607864f38ff43a8a1b
parents 8dfab03a 78f4bb2f

libs/incident/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -95,7 +95,17 @@ cc_test { 
    name: "libincident_test",

    test_config: "AndroidTest.xml",

    defaults: ["libincidentpriv_defaults"],

    test_suites: ["device-tests"],

    test_suites: ["device-tests", "mts"],

    compile_multilib: "both",

    multilib: {

        lib64: {

            suffix: "64",

        },

        lib32: {

            suffix: "32",

        },

    },

    require_root: true,



    include_dirs: [

        "frameworks/base/libs/incident/include",

libs/incident/AndroidTest.xml

+5 −1
Original line number Diff line number Diff line
@@ -16,13 +16,17 @@ 
<configuration description="Config for libincident_test">

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

    <option name="config-descriptor:metadata" key="component" value="misc" />

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

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

        <option name="cleanup" value="true" />

        <option name="push" value="libincident_test->/data/local/tmp/libincident_test" />

        <option name="append-bitness" value="true" />

    </target_preparer>

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

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="libincident_test" />

    </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>

libs/incident/TEST_MAPPING

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
  "presubmit": [

    {

      "name": "libincident_test"

    },

    {

      "name": "GtsLibIncidentTests"

    }

  ]

}