Merge "Convert test_mapping.zip to soong" into main (2b5a4066) · Commits · e / os / android_build

core/base_rules.mk

+0 −6

Original line number	Diff line number	Diff line
		@@ -931,12 +931,6 @@ else
		my_supported_variant := DEVICE
		endif
		endif
		###########################################################
		## Add test module to ALL_DISABLED_PRESUBMIT_TESTS if LOCAL_PRESUBMIT_DISABLED is set to true.
		###########################################################
		ifeq ($(LOCAL_PRESUBMIT_DISABLED),true)
		ALL_DISABLED_PRESUBMIT_TESTS += $(LOCAL_MODULE)
		endif # LOCAL_PRESUBMIT_DISABLED

		###########################################################
		## Register with ALL_MODULES

core/clear_vars.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,6 @@ LOCAL_PREBUILT_OBJ_FILES:=
		LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=
		LOCAL_USE_EMBEDDED_DEX:=
		LOCAL_USE_EMBEDDED_NATIVE_LIBS:=
		LOCAL_PRESUBMIT_DISABLED:=
		LOCAL_PRIVATE_PLATFORM_APIS:=
		LOCAL_PRIVILEGED_MODULE:=
		LOCAL_PROC_MACRO_LIBRARIES:=

core/definitions.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -90,9 +90,6 @@ ALL_INIT_RC_INSTALLED_PAIRS :=
		# All installed vintf manifest fragments for a partition at
		ALL_VINTF_MANIFEST_FRAGMENTS_LIST:=

		# All tests that should be skipped in presubmit check.
		ALL_DISABLED_PRESUBMIT_TESTS :=

		# All compatibility suites mentioned in LOCAL_COMPATIBILITY_SUITE
		ALL_COMPATIBILITY_SUITES :=

core/tasks/test_mapping.mk

deleted100644 → 0

+0 −40

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.

		# Create an artifact to include TEST_MAPPING files in source tree. Also include
		# a file (out/disabled-presubmit-tests) containing the tests that should be
		# skipped in presubmit check.

		.PHONY: test_mapping

		intermediates := $(call intermediates-dir-for,PACKAGING,test_mapping)
		test_mappings_zip := $(intermediates)/test_mappings.zip
		test_mapping_list := $(OUT_DIR)/.module_paths/TEST_MAPPING.list
		$(test_mappings_zip) : PRIVATE_all_disabled_presubmit_tests := $(ALL_DISABLED_PRESUBMIT_TESTS)
		$(test_mappings_zip) : PRIVATE_test_mapping_list := $(test_mapping_list)

		$(test_mappings_zip) : .KATI_DEPFILE := $(test_mappings_zip).d
		$(test_mappings_zip) : $(test_mapping_list) $(SOONG_ZIP)
		@echo "Building artifact to include TEST_MAPPING files and tests to skip in presubmit check."
		rm -rf $@ $(dir $@)/disabled-presubmit-tests
		echo $(sort $(PRIVATE_all_disabled_presubmit_tests)) \| tr " " "\n" > $(dir $@)/disabled-presubmit-tests
		$(SOONG_ZIP) -o $@ -C . -l $(PRIVATE_test_mapping_list) -C $(dir $@) -f $(dir $@)/disabled-presubmit-tests
		echo "$@ : " $$(cat $(PRIVATE_test_mapping_list)) > $@.d
		rm -f $(dir $@)/disabled-presubmit-tests

		test_mapping : $(test_mappings_zip)

		$(call dist-for-goals, dist_files test_mapping,$(test_mappings_zip))

		$(call declare-1p-target,$(test_mappings_zip),)