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

Commit 0bff1a47 authored by Cole Faust's avatar Cole Faust
Browse files

Reapply "Don't attempt to copy test files for soong modules" 

This reverts commit 519a38e1.

Bug: 388850000
Test: Presubmits
Change-Id: If2727bece77c8036ba49e7a95a4874a088b152c1
parent c409f753

core/base_rules.mk

+14 −10
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ $(call verify-module-name) 
my_test_data :=

my_test_config :=



LOCAL_IS_SOONG_MODULE := $(if $(filter $(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)),true)



LOCAL_IS_HOST_MODULE := $(strip $(LOCAL_IS_HOST_MODULE))

ifdef LOCAL_IS_HOST_MODULE

  ifneq ($(LOCAL_IS_HOST_MODULE),true)
@@ -128,7 +130,7 @@ include $(BUILD_SYSTEM)/local_current_sdk.mk 


# Check if the use of System SDK is correct. Note that, for Soong modules, the system sdk version

# check is done in Soong. No need to do it twice.

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

ifeq (,$(LOCAL_IS_SOONG_MODULE))

include $(BUILD_SYSTEM)/local_systemsdk.mk

endif
@@ -220,7 +222,7 @@ endif 
# modulo "null-sute", "mts", and "mcts". mts/mcts are automatically added if there's a different

# suite starting with "m(c)ts-". null-suite seems useless and is sometimes automatically added

# if no other suites are added.

ifneq (,$(filter $(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)))

ifneq (,$(LOCAL_IS_SOONG_MODULE))

  a := $(filter-out null-suite mts mcts,$(sort $(LOCAL_COMPATIBILITY_SUITE)))

  b := $(filter-out null-suite mts mcts,$(sort $(LOCAL_SOONG_PROVIDER_TEST_SUITES)))

  ifneq ($(a),$(b))
@@ -234,6 +236,7 @@ endif 
# We only support adding a default suite to native tests, native benchmarks, and instrumentation tests.

# This is because they are the only tests we currently auto-generate test configs for.

ifndef LOCAL_COMPATIBILITY_SUITE

  ifndef LOCAL_NO_AUTO_NULL_SUITE

    ifneq ($(filter NATIVE_TESTS NATIVE_BENCHMARK, $(LOCAL_MODULE_CLASS)),)

      LOCAL_COMPATIBILITY_SUITE := null-suite

    endif
@@ -243,6 +246,7 @@ ifndef LOCAL_COMPATIBILITY_SUITE 
      endif

    endif

  endif

endif



use_testcase_folder :=

ifeq ($(my_module_path),)
@@ -355,7 +359,7 @@ include $(BUILD_SYSTEM)/configure_module_stem.mk 
LOCAL_BUILT_MODULE := $(intermediates)/$(my_built_module_stem)



ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))

  ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  ifeq (,$(LOCAL_IS_SOONG_MODULE))

    $(call pretty-error, LOCAL_MODULE_MAKEFILE can only be used from $(SOONG_ANDROID_MK))

  endif

  # Use the install path requested by Soong.
@@ -389,7 +393,7 @@ LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE) 
# Don't create .toc files for Soong shared libraries, that is handled in

# Soong and soong_cc_prebuilt.mk

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

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

ifeq (,$(LOCAL_IS_SOONG_MODULE))

ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE).toc

$(LOCAL_BUILT_MODULE).toc: $(LOCAL_BUILT_MODULE)
@@ -511,7 +515,7 @@ else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) 
  $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

  $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"

  ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  ifneq (,$(LOCAL_IS_SOONG_MODULE))

	$(copy-file-or-link-to-new-target)

  else

	$(copy-file-to-new-target)

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ LOCAL_MULTILIB:= 
LOCAL_NATIVE_BENCHMARK:=

LOCAL_NDK_STL_VARIANT:=

LOCAL_NDK_VERSION:=current

LOCAL_NO_AUTO_NULL_SUITE :=

LOCAL_NO_CRT:=

LOCAL_NO_DEFAULT_COMPILER_FLAGS:=

LOCAL_NO_LIBCRT_BUILTINS:=

core/definitions.mk

+6 −3
Original line number Diff line number Diff line
@@ -3680,13 +3680,16 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ 
  $(eval COMPATIBILITY.$(suite).ARCH_DIRS.$(my_register_name) := $(my_compat_module_arch_dir_$(suite).$(my_register_name))) \

  $(eval COMPATIBILITY.$(suite).API_MAP_FILES += $$(my_compat_api_map_$(suite))) \

  $(eval COMPATIBILITY.$(suite).SOONG_INSTALLED_COMPATIBILITY_SUPPORT_FILES += $(LOCAL_SOONG_INSTALLED_COMPATIBILITY_SUPPORT_FILES)) \

  $(eval ALL_COMPATIBILITY_DIST_FILES += $$(my_compat_dist_$(suite))) \

  $(if $(LOCAL_IS_SOONG_MODULE),, \

    $(eval ALL_COMPATIBILITY_DIST_FILES += $$(my_compat_dist_$(suite)))) \

  $(eval COMPATIBILITY.$(suite).MODULES += $$(my_register_name))) \

$(eval $(my_all_targets) : \

  $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE), \

    $(foreach f,$(my_compat_dist_$(suite)), $(call word-colon,2,$(f))))) \

  $(if $(LOCAL_IS_SOONG_MODULE), \

    $(sort $(foreach p,$(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_config_$(suite))),$(call word-colon,2,$(p)))), \

    $(call copy-many-xml-files-checked, \

    $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_config_$(suite))))))

      $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_config_$(suite)))))))

endef



# Define symbols.zip and symbols-mapping.textproto build rule per test suite

core/envsetup.mk

+27 −0
Original line number Diff line number Diff line
@@ -1059,3 +1059,30 @@ PER_ARCH_MODULE_CLASSES := SHARED_LIBRARIES STATIC_LIBRARIES EXECUTABLES GYP REN 
ifeq ($(CALLED_FROM_SETUP),true)

PRINT_BUILD_CONFIG ?= true

endif



# CTS-specific config.

-include cts/build/config.mk

# device-tests-specific-config.

-include tools/tradefederation/build/suites/device-tests/config.mk

# general-tests-specific-config.

-include tools/tradefederation/build/suites/general-tests/config.mk

# STS-specific config.

-include test/sts/tools/sts-tradefed/build/config.mk

# CTS-Instant-specific config

-include test/suite_harness/tools/cts-instant-tradefed/build/config.mk

# MTS-specific config.

-include test/mts/tools/build/config.mk

# VTS-Core-specific config.

-include test/vts/tools/vts-core-tradefed/build/config.mk

# CSUITE-specific config.

-include test/app_compat/csuite/tools/build/config.mk

# CATBox-specific config.

-include test/catbox/tools/build/config.mk

# CTS-Root-specific config.

-include test/cts-root/tools/build/config.mk

# WVTS-specific config.

-include test/wvts/tools/build/config.mk

# DTS-specific config.

-include test/dts/tools/build/config.mk

# Include the google-specific config

-include vendor/google/build/config.mk

core/main.mk

+0 −28
Original line number Diff line number Diff line
@@ -56,31 +56,6 @@ DATE_FROM_FILE := date -d @$(BUILD_DATETIME_FROM_FILE) 
EMPTY_DIRECTORY := $(OUT_DIR)/empty

$(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*)



# CTS-specific config.

-include cts/build/config.mk

# device-tests-specific-config.

-include tools/tradefederation/build/suites/device-tests/config.mk

# general-tests-specific-config.

-include tools/tradefederation/build/suites/general-tests/config.mk

# STS-specific config.

-include test/sts/tools/sts-tradefed/build/config.mk

# CTS-Instant-specific config

-include test/suite_harness/tools/cts-instant-tradefed/build/config.mk

# MTS-specific config.

-include test/mts/tools/build/config.mk

# VTS-Core-specific config.

-include test/vts/tools/vts-core-tradefed/build/config.mk

# CSUITE-specific config.

-include test/app_compat/csuite/tools/build/config.mk

# CATBox-specific config.

-include test/catbox/tools/build/config.mk

# CTS-Root-specific config.

-include test/cts-root/tools/build/config.mk

# WVTS-specific config.

-include test/wvts/tools/build/config.mk

# DTS-specific config.

-include test/dts/tools/build/config.mk





# Clean rules

.PHONY: clean-dex-files
@@ -90,9 +65,6 @@ clean-dex-files: 
				grep -q "\.dex$$" && rm -f $$i) || continue ) ; done

	@echo "All dex files and archives containing dex files have been removed."



# Include the google-specific config

-include vendor/google/build/config.mk



# These are the modifier targets that don't do anything themselves, but

# change the behavior of the build.

# (must be defined before including definitions.make)