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

Commit d10e7ca8 authored by Nelson Li's avatar Nelson Li Committed by android-build-merger
Browse files

Merge "build/make: auto generate Test config file for Google Benchmark Test" am: 2338a70f 

am: 30bdb776

Change-Id: I26bb828227df3b9b1d592d38a1934d8dae15a31f
parents c47b50ec 30bdb776

core/autogen_test_config.mk

+6 −1
Original line number Diff line number Diff line
@@ -24,8 +24,13 @@ 


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

ifeq (true,$(is_native))

ifeq ($(LOCAL_NATIVE_BENCHMARK),true)

autogen_test_config_template := $(NATIVE_BENCHMARK_TEST_CONFIG_TEMPLATE)

else

autogen_test_config_template := $(NATIVE_TEST_CONFIG_TEMPLATE)

endif

# Auto generating test config file for native test

$(autogen_test_config_file) : $(NATIVE_TEST_CONFIG_TEMPLATE)

$(autogen_test_config_file) : $(autogen_test_config_template)

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

	$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE)&g' $^ > $@

my_auto_generate_config := true

core/base_rules.mk

+0 −4
Original line number Diff line number Diff line
@@ -546,10 +546,6 @@ ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS) 
  is_native := true

  multi_arch := true

endif

ifeq ($(LOCAL_MODULE_CLASS),NATIVE_BENCHMARK)

  is_native := true

  multi_arch := true

endif

ifdef LOCAL_MULTILIB

  multi_arch := true

endif

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ LOCAL_MODULE_UNSUPPORTED_HOST_CROSS_ARCH_WARN:= 
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:=

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:=

LOCAL_MULTILIB:=

LOCAL_NATIVE_BENCHMARK:=

LOCAL_NDK_STL_VARIANT:=

LOCAL_NDK_VERSION:=current

LOCAL_NO_CRT:=

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ BUILD_HOST_TEST_CONFIG := $(BUILD_SYSTEM)/host_test_config.mk 
BUILD_TARGET_TEST_CONFIG := $(BUILD_SYSTEM)/target_test_config.mk



INSTRUMENTATION_TEST_CONFIG_TEMPLATE := $(BUILD_SYSTEM)/instrumentation_test_config_template.xml

NATIVE_BENCHMARK_TEST_CONFIG_TEMPLATE := $(BUILD_SYSTEM)/native_benchmark_test_config_template.xml

NATIVE_TEST_CONFIG_TEMPLATE := $(BUILD_SYSTEM)/native_test_config_template.xml

EMPTY_TEST_CONFIG := $(BUILD_SYSTEM)/empty_test_config.xml

core/native_benchmark_test_config_template.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- This test config file is auto-generated. -->

<configuration description="Runs {MODULE}.">

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

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

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

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

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

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

    </test>

</configuration>