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

Commit 0765d532 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add build script to generate TF test XML file with filters"

parents 7b2129f1 26efd3a8

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ LOCAL_STATIC_LIBRARIES:= 
LOCAL_STRIP_MODULE:=

LOCAL_SYSTEM_SHARED_LIBRARIES:=none

LOCAL_TARGET_REQUIRED_MODULES:=

LOCAL_TEST_CONFIG_OPTIONS:=

LOCAL_TEST_DATA:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=

LOCAL_TIDY:=

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ BUILD_NOTICE_FILE := $(BUILD_SYSTEM)/notice_files.mk 
BUILD_HOST_DALVIK_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_java_library.mk

BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_static_java_library.mk



BUILD_HOST_TEST_CONFIG:= $(BUILD_SYSTEM)/host_test_config.mk

BUILD_TARGET_TEST_CONFIG:= $(BUILD_SYSTEM)/target_test_config.mk



# ###############################################################

# Parse out any modifier targets.

core/definitions.mk

+3 −1
Original line number Diff line number Diff line
@@ -3018,7 +3018,9 @@ STATS.MODULE_TYPE := \ 
  HOST_DALVIK_JAVA_LIBRARY \

  HOST_DALVIK_STATIC_JAVA_LIBRARY \

  base_rules \

  HEADER_LIBRARY

  HEADER_LIBRARY \

  HOST_TEST_CONFIG \

  TARGET_TEST_CONFIG



$(foreach s,$(STATS.MODULE_TYPE),$(eval STATS.MODULE_TYPE.$(s) :=))

define record-module-type

core/envsetup.mk

+3 −0
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ HOST_OUT_COMMON_GEN := $(HOST_COMMON_OUT_ROOT)/gen 


HOST_CROSS_OUT_GEN := $(HOST_CROSS_OUT)/gen



HOST_OUT_TEST_CONFIG := $(HOST_OUT)/test_config



# Out for HOST_2ND_ARCH

HOST_2ND_ARCH_VAR_PREFIX := 2ND_

HOST_2ND_ARCH_MODULE_SUFFIX := _32
@@ -466,6 +468,7 @@ TARGET_OUT_ETC := $(TARGET_OUT)/etc 
TARGET_OUT_NOTICE_FILES := $(TARGET_OUT_INTERMEDIATES)/NOTICE_FILES

TARGET_OUT_FAKE := $(PRODUCT_OUT)/fake_packages

TARGET_OUT_TESTCASES := $(PRODUCT_OUT)/testcases

TARGET_OUT_TEST_CONFIG := $(PRODUCT_OUT)/test_config



ifeq ($(SANITIZE_LITE),true)

# When using SANITIZE_LITE, APKs must not be packaged with sanitized libraries, as they will not

core/host_test_config.mk

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2017 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.

#



#

# Common rules for building a TradeFed test XML file for host side tests.

#



$(call record-module-type,HOST_TEST_CONFIG)



LOCAL_IS_HOST_MODULE := true



include $(BUILD_SYSTEM)/test_config_common.mk