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

Commit 8924400a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Build System: Solve dependency problem for test""

parents b6f2f8b2 6fe7f194

CleanSpec.mk

+0 −7
Original line number Diff line number Diff line
@@ -603,13 +603,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libnpt.so) 


$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*)



# Clean up old testcase files

$(call add-clean-step, rm -rf $(TARGET_OUT_TESTCASES)/*)

$(call add-clean-step, rm -rf $(HOST_OUT_TESTCASES)/*)

$(call add-clean-step, rm -rf $(HOST_CROSS_OUT_TESTCASES)/*)

$(call add-clean-step, rm -rf $(TARGET_OUT_DATA)/*)

$(call add-clean-step, rm -rf $(HOST_OUT)/vts/*)

$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-tradefed.jar)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/base_rules.mk

+15 −71
Original line number Diff line number Diff line
@@ -242,33 +242,6 @@ else 
  partition_tag := $(if $(call should-install-to-system,$(my_module_tags)),,_DATA)

endif

endif

# For test modules that lack a suite tag, set null-suite as the default.

# 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

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

    LOCAL_COMPATIBILITY_SUITE := null-suite

  endif

  ifneq ($(filter APPS, $(LOCAL_MODULE_CLASS)),)

    ifneq ($(filter $(my_module_tags),tests),)

      LOCAL_COMPATIBILITY_SUITE := null-suite

    endif

  endif

endif



use_testcase_folder :=

ifdef ENABLE_DEFAULT_TEST_LOCATION

  ifeq ($(my_module_path),)

    ifneq ($(LOCAL_MODULE),$(filter $(LOCAL_MODULE),$(DEFAULT_DATA_OUT_MODULES)))

      ifdef LOCAL_COMPATIBILITY_SUITE

        ifneq (true, $(LOCAL_IS_HOST_MODULE))

          use_testcase_folder := true

        endif

      endif

    endif

  endif

endif



ifeq ($(my_module_path),)

  install_path_var := $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS)

  ifeq (true,$(LOCAL_PRIVILEGED_MODULE))
@@ -276,16 +249,6 @@ ifeq ($(my_module_path),) 
  endif



  my_module_path := $($(install_path_var))



  # If use_testcase_folder be set, and LOCAL_MODULE_PATH not set,

  # overwrite the default path under testcase.

  ifeq ($(use_testcase_folder),true)

    arch_dir := $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

    testcase_folder := $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)/$(arch_dir)

    my_module_path := $(testcase_folder)

    arch_dir :=

  endif



  ifeq ($(strip $(my_module_path)),)

    $(error $(LOCAL_PATH): unhandled install path "$(install_path_var) for $(LOCAL_MODULE)")

  endif
@@ -361,11 +324,9 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) 
  # Neither do Runtime Resource Overlay apks, which contain just the overlaid resources.

  else ifeq ($(LOCAL_IS_RUNTIME_RESOURCE_OVERLAY),true)

  else

    ifneq ($(use_testcase_folder),true)

    my_module_path := $(my_module_path)/$(LOCAL_MODULE)

  endif

  endif

  endif

  LOCAL_INSTALLED_MODULE := $(my_module_path)/$(my_installed_module_stem)

endif
@@ -468,23 +429,12 @@ $(foreach c, $(my_path_components),\ 
my_init_rc_installed :=

my_init_rc_pairs :=

my_installed_symlinks :=

my_default_test_module :=

ifeq ($(use_testcase_folder),true)

arch_dir := $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

my_default_test_module := $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)/$(arch_dir)/$(my_installed_module_stem)

arch_dir :=

endif



ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

ifneq ($(LOCAL_INSTALLED_MODULE),$(my_default_test_module))

# Install into the testcase folder

$(LOCAL_INSTALLED_MODULE) : $(my_default_test_module)

$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"

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

	$(PRIVATE_POST_INSTALL_CMD)

endif



ifndef LOCAL_IS_HOST_MODULE

# Rule to install the module's companion init.rc.
@@ -594,6 +544,20 @@ endif 
endif

endif



# For test modules that lack a suite tag, set null-suite as the default.

# 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

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

LOCAL_COMPATIBILITY_SUITE := null-suite

endif

ifneq ($(filter APPS, $(LOCAL_MODULE_CLASS)),)

ifneq ($(filter $(my_module_tags),tests),)

LOCAL_COMPATIBILITY_SUITE := null-suite

endif

endif

endif



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

## Compatibility suite files.

###########################################################
@@ -611,15 +575,9 @@ endif 
ifdef LOCAL_MULTILIB

  multi_arch := true

endif



ifdef multi_arch

  arch_dir := /$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

else

ifeq ($(use_testcase_folder),true)

  arch_dir := /$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

endif

endif



multi_arch :=



# The module itself.
@@ -713,17 +671,6 @@ ifneq (,$(filter $(SOONG_OUT_DIR)%,$(LOCAL_FULL_TEST_CONFIG))) 
endif





ifeq ($(use_testcase_folder),true)

ifneq ($(my_test_data_file_pairs),)

$(foreach pair, $(my_test_data_file_pairs), \

  $(eval parts := $(subst :,$(space),$(pair))) \

  $(eval src_path := $(word 1,$(parts))) \

  $(eval file := $(word 2,$(parts))) \

  $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

    $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \

      $(call filter-copy-pair,$(src_path),$(call append-path,$(dir),$(file)),$(my_installed_test_data))))))

endif

else

ifneq ($(my_test_data_file_pairs),)

$(foreach pair, $(my_test_data_file_pairs), \

  $(eval parts := $(subst :,$(space),$(pair))) \
@@ -733,9 +680,6 @@ $(foreach pair, $(my_test_data_file_pairs), \ 
    $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \

      $(src_path):$(call append-path,$(dir),$(file))))))

endif

endif







arch_dir :=

is_native :=

core/config.mk

+0 −8
Original line number Diff line number Diff line
@@ -1174,12 +1174,4 @@ include $(BUILD_SYSTEM)/ninja_config.mk 
include $(BUILD_SYSTEM)/soong_config.mk

endif



# If ENABLE_DEFAULT_TEST_LOCATION is true, move default install path from

# $(my_prefix)OUT_DATA to $(my_prefix)OUT_TESTCASES

ENABLE_DEFAULT_TEST_LOCATION := true

-include external/linux-kselftest/android/kselftest_test_list.mk

-include external/ltp/android/ltp_package_list.mk

DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages) $(kselftest_modules)

.KATI_READONLY := ENABLE_DEFAULT_TEST_LOCATION DEFAULT_DATA_OUT_MODULES



include $(BUILD_SYSTEM)/dumpvar.mk

core/definitions.mk

+0 −19
Original line number Diff line number Diff line
@@ -2478,25 +2478,6 @@ $(2): $(1) $(ZIPALIGN) $(ZIP2ZIP) 
	$$(align-package)

endef



# Create copy pair for compatibility suite

# Filter out $(LOCAL_INSTALLED_MODULE) to prevent overriding target

# $(1): source path

# $(2): destination path

# The format of copy pair is src:dst

define compat-copy-pair

$(if $(filter-out $(2), $(LOCAL_INSTALLED_MODULE)), $(1):$(2))

endef



# Create copy pair for $(1) $(2)

# If $(2) is substring of $(3) do nothing.

# $(1): source path

# $(2): destination path

# $(3): filter-out target

# The format of copy pair is src:dst

define filter-copy-pair

$(if $(findstring $(2), $(3)),,$(1):$(2))

endef



# Copies many files.

# $(1): The files to copy.  Each entry is a ':' separated src:dst pair

# $(2): An optional directory to prepend to the destination

core/envsetup.mk

+1 −13
Original line number Diff line number Diff line
@@ -523,11 +523,6 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_TESTCASES := $(TARGET_OUT_TESTCASES) 
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS_PRIVILEGED \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_TESTCASES



MODULE_CLASS_APPS := app

MODULE_CLASS_EXECUTABLES := bin

MODULE_CLASS_JAVA_LIBRARIES := framework

MODULE_CLASS_NATIVE_TESTS := nativetest

MODULE_CLASS_METRIC_TESTS := benchmarktest

TARGET_OUT_DATA := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA)

TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)

TARGET_OUT_DATA_SHARED_LIBRARIES := $(TARGET_OUT_SHARED_LIBRARIES)
@@ -547,7 +542,6 @@ TARGET_OUT_DATA_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest 
TARGET_OUT_VENDOR_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest$(TARGET_VENDOR_TEST_SUFFIX)

TARGET_OUT_VENDOR_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest$(TARGET_VENDOR_TEST_SUFFIX)

endif

MODULE_CLASS_FAKE := fake_packages

TARGET_OUT_DATA_FAKE := $(TARGET_OUT_DATA)/fake_packages

.KATI_READONLY := \

  TARGET_OUT_DATA \
@@ -562,13 +556,7 @@ TARGET_OUT_DATA_FAKE := $(TARGET_OUT_DATA)/fake_packages 
  TARGET_OUT_DATA_METRIC_TESTS \

  TARGET_OUT_VENDOR_NATIVE_TESTS \

  TARGET_OUT_VENDOR_METRIC_TESTS \

  TARGET_OUT_DATA_FAKE \

  MODULE_CLASS_APPS \

  MODULE_CLASS_EXECUTABLES \

  MODULE_CLASS_JAVA_LIBRARIES \

  MODULE_CLASS_NATIVE_TESTS \

  MODULE_CLASS_METRIC_TESTS \

  MODULE_CLASS_FAKE

  TARGET_OUT_DATA_FAKE



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_DATA_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_SHARED_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES)