diff options
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 4 | ||||
| -rw-r--r-- | core/fuzz_test.mk | 6 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/tasks/vts-core-tests.mk | 9 | ||||
| -rw-r--r-- | target/product/gsi/current.txt | 1 |
6 files changed, 13 insertions, 10 deletions
diff --git a/core/Makefile b/core/Makefile index 6c90b51fcb..a86b7b7790 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3655,7 +3655,6 @@ INTERNAL_OTATOOLS_MODULES := \ mkbootfs \ mkbootimg \ mke2fs \ - mke2fs.conf \ mkf2fsuserimg.sh \ mksquashfs \ mksquashfsimage.sh \ diff --git a/core/definitions.mk b/core/definitions.mk index a442bc0e0c..7450d4fc0c 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2857,7 +2857,9 @@ endef # Can be passed a subdirectory to use for the common testcase directory. define compatibility_suite_dirs $(strip \ - $(COMPATIBILITY_TESTCASES_OUT_$(1)) \ + $(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1)),\ + $(COMPATIBILITY_TESTCASES_OUT_$(1))/$(LOCAL_MODULE)$(2),\ + $(COMPATIBILITY_TESTCASES_OUT_$(1))) \ $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(2)) endef diff --git a/core/fuzz_test.mk b/core/fuzz_test.mk index 71801ba62a..4a0fcfa292 100644 --- a/core/fuzz_test.mk +++ b/core/fuzz_test.mk @@ -67,12 +67,6 @@ endif LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE) LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE) -ifndef LOCAL_MULTILIB -ifndef LOCAL_32_BIT_ONLY -LOCAL_MULTILIB := 64 -endif -endif - ifndef LOCAL_STRIP_MODULE LOCAL_STRIP_MODULE := keep_symbols endif diff --git a/core/main.mk b/core/main.mk index 1b2b3e6e78..618594b201 100644 --- a/core/main.mk +++ b/core/main.mk @@ -75,6 +75,8 @@ $(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*) -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 # Clean rules .PHONY: clean-dex-files diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index fb1e1c61ff..95b729ab72 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -44,6 +44,13 @@ $(vts-core-zip) : $(COMPATIBILITY.vts-core.FILES) $(my_host_shared_lib_for_vts_c $(PRIVATE_vts_core_list) vts-core: $(vts-core-zip) -$(call dist-for-goals, vts-core, $(vts-core-zip) $(vts-core-list-zip) $(vts-core-configs-zip)) + +test_suite_name := vts-core +test_suite_tradefed := vts-core-tradefed +test_suite_readme := test/vts/tools/vts-core-tradefed/README +include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk +vts-core: $(compatibility_zip) + +$(call dist-for-goals, vts-core, $(vts-core-zip) $(vts-core-list-zip) $(vts-core-configs-zip) $(compatibility_zip)) tests: vts-core diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index a11531ef85..5a507936ca 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -59,7 +59,6 @@ VNDK-core: android.frameworks.displayservice@1.0.so VNDK-core: android.frameworks.schedulerservice@1.0.so VNDK-core: android.frameworks.sensorservice@1.0.so VNDK-core: android.frameworks.stats@1.0.so -VNDK-core: android.frameworks.vr.composer@1.0.so VNDK-core: android.hardware.atrace@1.0.so VNDK-core: android.hardware.audio.common@2.0.so VNDK-core: android.hardware.audio.common@4.0.so |