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

Commit 4e9a9485 authored by Julien Desprez's avatar Julien Desprez
Browse files

Add a placeholder EXTRA_OPTIONS to inject more tradefed options 

Simply remove the placeholder in makefiles, for now I am
not sure we need to support this in makefiles at all.

Test: call the sed method
Bug: 124024827
Change-Id: Iae78ae86c20c5da6b7314b749f54983a312c4a7d
parent 5a4696e4

core/autogen_test_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ endif 
$(autogen_test_config_file): PRIVATE_MODULE_NAME := $(LOCAL_MODULE)

$(autogen_test_config_file) : $(autogen_test_config_template)

	@echo "Auto generating test config $(notdir $@)"

	$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE_NAME)&g' $< > $@

	$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE_NAME)&g;s&{EXTRA_OPTIONS}&&g' $< > $@

my_auto_generate_config := true

else

# Auto generating test config file for instrumentation test

core/native_test_config_template.xml

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
<configuration description="Runs {MODULE}.">

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

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



    {EXTRA_OPTIONS}



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

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

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