diff options
| author | Ruchir Rastogi <ruchirr@google.com> | 2020-06-12 04:25:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-12 04:25:53 +0000 |
| commit | 49efb08d7966956a28cb238b1ecb87302a8cba2d (patch) | |
| tree | ca3b7108d3b8a92ff9e5497fddac2c3573804099 /libs | |
| parent | bcd72970839869a3b6440a6105ac7039dcd473f7 (diff) | |
| parent | 003ef4903afd912fd283e85c6f8b704445a97e08 (diff) | |
Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592
Change-Id: Ibb041b389a8f2ce24f351c46bbe9500b877aeaf7
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/incident/Android.bp | 12 | ||||
| -rw-r--r-- | libs/incident/AndroidTest.xml | 6 | ||||
| -rw-r--r-- | libs/incident/TEST_MAPPING | 3 |
3 files changed, 16 insertions, 5 deletions
diff --git a/libs/incident/Android.bp b/libs/incident/Android.bp index af6411011411..d291ec001daf 100644 --- a/libs/incident/Android.bp +++ b/libs/incident/Android.bp @@ -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", diff --git a/libs/incident/AndroidTest.xml b/libs/incident/AndroidTest.xml index 7c0b04471d13..b6b3f8596826 100644 --- a/libs/incident/AndroidTest.xml +++ b/libs/incident/AndroidTest.xml @@ -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> diff --git a/libs/incident/TEST_MAPPING b/libs/incident/TEST_MAPPING index 59ebe7664b5f..25e000092ecf 100644 --- a/libs/incident/TEST_MAPPING +++ b/libs/incident/TEST_MAPPING @@ -2,9 +2,6 @@ "presubmit": [ { "name": "libincident_test" - }, - { - "name": "GtsLibIncidentTests" } ] } |