tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "ATest: GTest auto gen config support run-test-as.""

Browse source
This commit is contained in:
Treehugger Robot 2018-10-25 08:53:24 +00:00 committed by Gerrit Code Review
commit 73b998ad2e
3 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/autogen_test_config.mk
View file

@ -34,16 +34,9 @@ else
endif
# Auto generating test config file for native test
$(autogen_test_config_file): PRIVATE_MODULE_NAME := $(LOCAL_MODULE)
$(autogen_test_config_file): PRIVATE_RUN_UID := $(LOCAL_RUN_TEST_AS)
$(autogen_test_config_file) : $(autogen_test_config_template)
@echo "Auto generating test config $(notdir $@)"
$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE_NAME)&g' $< > $@
ifneq ($(LOCAL_RUN_TEST_AS),)
$(hide) sed -i 's&{UID_OPTION}&<option name="run-test-as" value="$(PRIVATE_RUN_UID)" />&g' $@
else
$(hide) sed -i '/{UID_OPTION}/d' $@
endif
my_auto_generate_config := true
else
# Auto generating test config file for instrumentation test

1
core/clear_vars.mk
View file

@ -245,7 +245,6 @@ LOCAL_RESOURCE_DIR:=
LOCAL_RMTYPEDEFS:=
LOCAL_RRO_THEME:=
LOCAL_RTTI_FLAG:=
LOCAL_RUN_TEST_AS :=
LOCAL_SANITIZE:=
LOCAL_SANITIZE_DIAG:=
LOCAL_SANITIZE_RECOVER:=

1
core/native_test_config_template.xml
View file

@ -23,7 +23,6 @@
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
{UID_OPTION}
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="{MODULE}" />
</test>