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

Commit ae5c1cf3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 9d57bf30 

Original change: https://android-review.googlesource.com/c/platform/build/+/1832959

Change-Id: I8d2436e24abdff9dbbeb23db34a420246c69f3b1
parents 2ab762b6 9d57bf30

core/autogen_test_config.mk

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
#   autogen_test_config_file: Path to the test config file generated.



autogen_test_config_file := $(dir $(LOCAL_BUILT_MODULE))$(LOCAL_MODULE).config

autogen_test_install_base := /data/local/tests/unrestricted

# TODO: (b/167308193) Switch to /data/local/tests/unrestricted as the default install base.

autogen_test_install_base := /data/local/tmp

# Automatically setup test root for native test.

ifeq (true,$(is_native))

  ifeq (true,$(LOCAL_VENDOR_MODULE))

core/native_benchmark_test_config_template.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 


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

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

        <option name="push" value="{MODULE}->/data/local/tests/unrestricted/{MODULE}" />

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

    </target_preparer>

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

        <option name="native-benchmark-device-path" value="/data/local/tests/unrestricted" />

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

        <option name="benchmark-module-name" value="{MODULE}" />

    </test>

</configuration>

core/rust_device_benchmark_config_template.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
<configuration description="Config to run {MODULE} rust benchmark tests.">

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

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

        <option name="push" value="{MODULE}->/data/local/tests/unrestricted/{MODULE}" />

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.rust.RustBinaryTest" >

        <option name="test-device-path" value="/data/local/tests/unrestricted" />

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

        <option name="module-name" value="{MODULE}" />

        <option name="is-benchmark" value="true" />

    </test>

core/rust_device_test_config_template.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
<configuration description="Config to run {MODULE} device tests.">

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

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

        <option name="push" value="{MODULE}->/data/local/tests/unrestricted/{MODULE}" />

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.rust.RustBinaryTest" >

        <option name="test-device-path" value="/data/local/tests/unrestricted" />

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

        <option name="module-name" value="{MODULE}" />

    </test>

</configuration>